' . $this->escape(Text::_($fieldSet->description)) . '
';
- }
- ?>
- form->getFieldset($name) as $field) : ?>
- form->getFieldsets('params');
-foreach ($fieldSets as $name => $fieldSet) :
- $paramstabs = 'params-' . $name;
- echo HTMLHelper::_('bootstrap.addTab', 'myTab', $paramstabs, Text::_($fieldSet->label));
-
- if (isset($fieldSet->description) && trim($fieldSet->description)) :
- echo '' . $this->escape(Text::_($fieldSet->description)) . '
';
- endif;
- ?>
- form->getFieldset($name) as $field) : ?>
-
-
label; ?>
-
input; ?>
-
-
-
-
diff --git a/administrator/components/com_contact/tmpl/contact/modal_associations.php b/administrator/components/com_contact/tmpl/contact/modal_associations.php
deleted file mode 100644
index bd9c6605e2a55..0000000000000
--- a/administrator/components/com_contact/tmpl/contact/modal_associations.php
+++ /dev/null
@@ -1,14 +0,0 @@
-form->getFieldsets('params');
-foreach ($fieldSets as $name => $fieldSet) :
- $paramstabs = 'params-' . $name;
- echo HTMLHelper::_('bootstrap.addTab', 'myTab', $paramstabs, Text::_($fieldSet->label));
-
- if (isset($fieldSet->description) && trim($fieldSet->description)) :
- echo '' . $this->escape(Text::_($fieldSet->description)) . '
';
- endif;
- ?>
- form->getFieldset($name) as $field) : ?>
-
-
label; ?>
-
input; ?>
-
-
-
-
diff --git a/administrator/components/com_content/Service/HTML/AdministratorService.php b/administrator/components/com_content/Service/HTML/AdministratorService.php
index 70e3cb7960c9f..6b4ee27979972 100644
--- a/administrator/components/com_content/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/Service/HTML/AdministratorService.php
@@ -12,12 +12,10 @@
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Associations;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;
-use Joomla\Utilities\ArrayHelper;
/**
* Content HTML helper
@@ -94,38 +92,4 @@ public function association($articleid)
return $html;
}
-
- /**
- * Show the feature/unfeature links
- *
- * @param integer $value The state value
- * @param integer $i Row number
- * @param boolean $canChange Is user allowed to change?
- *
- * @return string HTML code
- */
- public function featured($value, $i, $canChange = true)
- {
- // Array of image, task, title, action
- $states = array(
- 0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
- 1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
- );
- $state = ArrayHelper::getValue($states, (int) $value, $states[1]);
- $icon = $state[0];
-
- if ($canChange)
- {
- $html = ' ';
- }
- else
- {
- $html = ' ';
- }
-
- return $html;
- }
}
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 4f803f5ef5ded..72f4b1b8cf8ee 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -649,14 +649,6 @@
-
-
-
-
diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
index 921c9ffa8e786..7eec6928a4e75 100644
--- a/administrator/components/com_content/forms/filter_articles.xml
+++ b/administrator/components/com_content/forms/filter_articles.xml
@@ -126,10 +126,10 @@
JCATEGORY_DESC
JGRID_HEADING_ACCESS_ASC
JGRID_HEADING_ACCESS_DESC
- JASSOCIATIONS_ASC
- JASSOCIATIONS_DESC
JAUTHOR_ASC
JAUTHOR_DESC
+ JASSOCIATIONS_ASC
+ JASSOCIATIONS_DESC
JGRID_HEADING_LANGUAGE_ASC
JGRID_HEADING_LANGUAGE_DESC
JDATE_ASC
diff --git a/administrator/components/com_content/tmpl/article/edit_metadata.php b/administrator/components/com_content/tmpl/article/edit_metadata.php
deleted file mode 100644
index 7d7cd29fd671e..0000000000000
--- a/administrator/components/com_content/tmpl/article/edit_metadata.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
+
+
+
-
-
-
@@ -333,13 +333,6 @@
escape($item->access_level); ?>
-
-
- association) : ?>
- id); ?>
-
-
-
created_by != 0) : ?>
@@ -352,6 +345,13 @@
escape($item->created_by_alias)); ?>
+
+
+ association) : ?>
+ id); ?>
+
+
+
diff --git a/administrator/components/com_csp/Helper/ReporterHelper.php b/administrator/components/com_csp/Helper/ReporterHelper.php
index 6f122497ba773..8266279db1fe8 100644
--- a/administrator/components/com_csp/Helper/ReporterHelper.php
+++ b/administrator/components/com_csp/Helper/ReporterHelper.php
@@ -48,4 +48,32 @@ public static function getHttpHeadersPluginId()
return $result;
}
+
+ /**
+ * Check the com_csp trash to show a warning in this case
+ *
+ * @return boolean The status of the trash; Do items exists in the trash
+ *
+ * @since 4.0.0
+ */
+ public static function getCspTrashStatus()
+ {
+ $db = Factory::getDbo();
+ $query = $db->getQuery(true)
+ ->select('COUNT(*)')
+ ->from($db->quoteName('#__csp'))
+ ->where($db->quoteName('published') . ' = ' . $db->quote('-2'));
+ $db->setQuery($query);
+
+ try
+ {
+ $result = (int) $db->loadResult();
+ }
+ catch (\RuntimeException $e)
+ {
+ Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+ }
+
+ return boolval($result);
+ }
}
diff --git a/administrator/components/com_csp/View/Reports/HtmlView.php b/administrator/components/com_csp/View/Reports/HtmlView.php
index d0c4f703ad349..ecc685b6f866a 100644
--- a/administrator/components/com_csp/View/Reports/HtmlView.php
+++ b/administrator/components/com_csp/View/Reports/HtmlView.php
@@ -11,6 +11,7 @@
defined('_JEXEC') or die;
+use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Helper\ContentHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
@@ -102,6 +103,13 @@ public function display($tpl = null)
$this->httpHeadersId = ReporterHelper::getHttpHeadersPluginId();
}
+ if (ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy_mode', 'custom') === 'detect'
+ && ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy', 0)
+ && ReporterHelper::getCspTrashStatus())
+ {
+ $this->trashWarningMessage = Text::_('COM_CSP_COLLECTING_TRASH_WARNING');
+ }
+
$this->addToolbar();
return parent::display($tpl);
diff --git a/administrator/components/com_csp/tmpl/reports/default.php b/administrator/components/com_csp/tmpl/reports/default.php
index 07effa0da6b2e..bedcc2160d79d 100644
--- a/administrator/components/com_csp/tmpl/reports/default.php
+++ b/administrator/components/com_csp/tmpl/reports/default.php
@@ -55,6 +55,9 @@
)
); ?>
+ trashWarningMessage)) : ?>
+ enqueueMessage($this->trashWarningMessage, 'warning'); ?>
+
items)) : ?>
diff --git a/administrator/components/com_fields/tmpl/field/modal_options.php b/administrator/components/com_fields/tmpl/field/modal_options.php
deleted file mode 100644
index c1c1dfcac891c..0000000000000
--- a/administrator/components/com_fields/tmpl/field/modal_options.php
+++ /dev/null
@@ -1,48 +0,0 @@
- 'collapse0'));
-
-$fieldSets = $this->form->getFieldsets('params');
-$i = 0;
-?>
- $fieldSet) : ?>
- label) ? $fieldSet->label : 'COM_FIELDS_' . $name . '_FIELDSET_LABEL'; ?>
-
- description) && trim($fieldSet->description)) : ?>
- ' . $this->escape(Text::_($fieldSet->description)) . ''; ?>
-
- form->getFieldset($name) as $field) : ?>
-
-
- label; ?>
-
-
- input; ?>
-
-
-
-
-
-
-
- form->getLabel('note'); ?>
-
-
- form->getInput('note'); ?>
-
-
-
-
-
-
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index eebb3723a1fb5..fec767a6dfffc 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -93,9 +93,7 @@
-
- name; ?>
-
+ name; ?>
description; ?>
diff --git a/administrator/components/com_languages/layouts/joomla/searchtools/default.php b/administrator/components/com_languages/layouts/joomla/searchtools/default.php
index 8139f4f735b68..4fc48a73ceeef 100644
--- a/administrator/components/com_languages/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_languages/layouts/joomla/searchtools/default.php
@@ -1,7 +1,7 @@
published, $i, 'languages.', $canChange); ?>
-
escape($item->title); ?>
escape($item->title); ?>
-
escape($item->title_native); ?>
diff --git a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
index f4a2f143b792f..fd8981d07940d 100644
--- a/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
+++ b/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -1,7 +1,7 @@
- 'collapse0'));
- $fieldSets = $this->form->getFieldsets('params');
- $i = 0;
-
- foreach ($fieldSets as $name => $fieldSet) :
- if (!(($this->item->link == 'index.php?option=com_wrapper&view=wrapper') && $fieldSet->name == 'request')
- && !($this->item->link == 'index.php?Itemid=' && $fieldSet->name == 'aliasoptions')) :
- $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_' . $name . '_FIELDSET_LABEL';
- echo HTMLHelper::_('bootstrap.addSlide', 'menuOptions', Text::_($label), 'collapse' . ($i++));
- if (isset($fieldSet->description) && trim($fieldSet->description)) :
- echo '' . $this->escape(Text::_($fieldSet->description)) . '
';
- endif;
- ?>
- form->getFieldset($name) as $field) : ?>
-
- label; ?>
- input; ?>
-
-
-
- 'collapse0'));
- $fieldSets = $this->form->getFieldsets('params');
- $i = 0;
-
- foreach ($fieldSets as $name => $fieldSet) :
- if (!(($this->item->link == 'index.php?option=com_wrapper&view=wrapper') && $fieldSet->name == 'request')
- && !($this->item->link == 'index.php?Itemid=' && $fieldSet->name == 'aliasoptions')) :
- $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_' . $name . '_FIELDSET_LABEL';
- echo HTMLHelper::_('bootstrap.addSlide', 'menuOptions', Text::_($label), 'collapse' . ($i++));
- if (isset($fieldSet->description) && trim($fieldSet->description)) :
- echo '' . $this->escape(Text::_($fieldSet->description)) . '
';
- endif;
- ?>
- form->getFieldset($name) as $field) : ?>
-
-
-
-
- label; ?>
-
-
- input; ?>
-
-
-
-
-
escape($item->title); ?>
+ description)) : ?>
+
+ (escape($item->description); ?>)
+
+
diff --git a/administrator/components/com_messages/Service/HTML/Messages.php b/administrator/components/com_messages/Service/HTML/Messages.php
index 3fa37e9911d93..8cc711a82c686 100644
--- a/administrator/components/com_messages/Service/HTML/Messages.php
+++ b/administrator/components/com_messages/Service/HTML/Messages.php
@@ -11,7 +11,7 @@
defined('_JEXEC') or die;
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
use Joomla\Utilities\ArrayHelper;
/**
@@ -46,8 +46,8 @@ public function status($i, $value = 0, $canChange = false)
if ($canChange)
{
- $html = ' ';
}
diff --git a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
index 6644c4381b00f..4c525894a45c1 100644
--- a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
+++ b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
@@ -1,7 +1,7 @@
-
-
diff --git a/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql b/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
index da029c00d6067..11df5f72df791 100644
--- a/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
+++ b/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
@@ -26,7 +26,6 @@ CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
`metakey` text NOT NULL,
`metadesc` text NOT NULL,
`metadata` text NOT NULL,
- `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
`publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`description` text NOT NULL,
@@ -39,6 +38,5 @@ CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
KEY `idx_state` (`published`),
KEY `idx_catid` (`catid`),
KEY `idx_createdby` (`created_by`),
- KEY `idx_language` (`language`),
- KEY `idx_xreference` (`xreference`)
+ KEY `idx_language` (`language`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
deleted file mode 100644
index 2f706c4de8834..0000000000000
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit_metadata.php
+++ /dev/null
@@ -1,14 +0,0 @@
-form->getFieldsets('params');
-foreach ($fieldSets as $name => $fieldSet) :
- ?>
-
- description) && trim($fieldSet->description)) : ?>
-
-
- escape(Text::_($fieldSet->description)); ?>
-
-
- form->getFieldset($name) as $field) : ?>
-
-
- label; ?>
-
-
- input; ?>
-
-
-
-
-
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
deleted file mode 100644
index 76c4291e4bd5d..0000000000000
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_associations.php
+++ /dev/null
@@ -1,14 +0,0 @@
-fieldset = 'jbasic';
-echo LayoutHelper::render('joomla.edit.fieldset', $this);
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
deleted file mode 100644
index 2f706c4de8834..0000000000000
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/modal_metadata.php
+++ /dev/null
@@ -1,14 +0,0 @@
-form->getFieldsets('params');
-foreach ($fieldSets as $name => $fieldSet) :
- ?>
-
- description) && trim($fieldSet->description)) : ?>
-
-
- escape(Text::_($fieldSet->description)); ?>
-
-
- form->getFieldset($name) as $field) : ?>
-
-
label; ?>
-
input; ?>
-
-
-
-
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit_options.php b/administrator/components/com_plugins/tmpl/plugin/edit_options.php
deleted file mode 100644
index 4a1b8e73b7192..0000000000000
--- a/administrator/components/com_plugins/tmpl/plugin/edit_options.php
+++ /dev/null
@@ -1,54 +0,0 @@
-fieldsets as $name => $fieldset)
-{
- if (!isset($fieldset->repeat) || isset($fieldset->repeat) && $fieldset->repeat == false)
- {
- $label = !empty($fieldset->label) ? Text::_($fieldset->label) : Text::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true);
- $optionsname = 'options-' . $fieldset->name;
- echo HTMLHelper::_('uitab.addTab', 'myTab', $optionsname, $label);
-
- if (isset($fieldset->description) && trim($fieldset->description))
- {
- echo '' . $this->escape(Text::_($fieldset->description)) . '
';
- }
-
- $hidden_fields = '';
-
- foreach ($this->form->getFieldset($name) as $field)
- {
- if (!$field->hidden)
- {
- ?>
-
-
- label; ?>
-
-
- input; ?>
-
-
- input;
- }
- }
- echo $hidden_fields;
-
- echo HTMLHelper::_('uitab.endTab');
- }
-}
diff --git a/administrator/components/com_privacy/tmpl/capabilities/default.php b/administrator/components/com_privacy/tmpl/capabilities/default.php
index aaadd0a4def1c..4edac1a972349 100644
--- a/administrator/components/com_privacy/tmpl/capabilities/default.php
+++ b/administrator/components/com_privacy/tmpl/capabilities/default.php
@@ -9,7 +9,6 @@
defined('_JEXEC') or die;
-use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
/** @var PrivacyViewCapabilities $this */
@@ -17,7 +16,7 @@
?>
-
+
capabilities)) : ?>
@@ -26,11 +25,9 @@
-
- 'slide-0')); ?>
-
capabilities as $extension => $capabilities) : ?>
-
+
+
@@ -43,10 +40,7 @@
-
-
+
-
-
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index f0c2706f74d4b..4a518815be232 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -22,8 +22,6 @@
// Include the component HTML helpers.
HTMLHelper::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/html');
-// Load the tooltip behavior.
-HTMLHelper::_('bootstrap.tooltip');
HTMLHelper::_('behavior.multiselect');
$user = Factory::getUser();
@@ -37,88 +35,88 @@