Updating 4.3-dev with changes from 4.2-dev

administrator/components/com_media/resources/scripts/app/Api.es6.js

@@ -52,7 +52,7 @@ class Api {
       }
 
       // eslint-disable-next-line no-underscore-dangle
-      let url = `${this._baseUrl}&task=api.files&path=${dir}`;
+      let url = `${this._baseUrl}&task=api.files&path=${encodeURIComponent(dir)}`;
 
       if (full) {
         url += `&url=${full}`;
@@ -88,7 +88,7 @@ class Api {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
       // eslint-disable-next-line no-underscore-dangle
-      const url = `${this._baseUrl}&task=api.files&path=${parent}`;
+      const url = `${this._baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`;
       // eslint-disable-next-line no-underscore-dangle
       const data = { [this._csrfToken]: '1', name };
 
@@ -123,7 +123,7 @@ class Api {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
       // eslint-disable-next-line no-underscore-dangle
-      const url = `${this._baseUrl}&task=api.files&path=${parent}`;
+      const url = `${this._baseUrl}&task=api.files&path=${encodeURIComponent(parent)}`;
       const data = {
         // eslint-disable-next-line no-underscore-dangle
         [this._csrfToken]: '1',
@@ -165,7 +165,7 @@ class Api {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
       // eslint-disable-next-line no-underscore-dangle
-      const url = `${this._baseUrl}&task=api.files&path=${path}`;
+      const url = `${this._baseUrl}&task=api.files&path=${encodeURIComponent(path)}`;
       const data = {
         // eslint-disable-next-line no-underscore-dangle
         [this._csrfToken]: '1',
@@ -201,7 +201,7 @@ class Api {
     // Wrap the ajax call into a real promise
     return new Promise((resolve, reject) => {
       // eslint-disable-next-line no-underscore-dangle
-      const url = `${this._baseUrl}&task=api.files&path=${path}`;
+      const url = `${this._baseUrl}&task=api.files&path=${encodeURIComponent(path)}`;
       // eslint-disable-next-line no-underscore-dangle
       const data = { [this._csrfToken]: '1' };
 

administrator/components/com_tags/forms/tag.xml

@@ -23,6 +23,7 @@
 		name="parent_id"
 		type="tag"
 		label="COM_TAGS_FIELD_PARENT_LABEL"
+		custom="false"
 		mode="nested"
 		validate="notequals"
 		field="id"

administrator/components/com_users/src/Model/LevelModel.php

@@ -68,7 +68,7 @@ protected function canDelete($record)
         // Check if the access level is being used by any content.
         if ($this->levelsInUse === null) {
             // Populate the list once.
-            $this->levelsInUse = array();
+            $this->levelsInUse = [];
 
             $db    = $this->getDatabase();
             $query = $db->getQuery(true)
@@ -134,7 +134,7 @@ protected function canDelete($record)
      *
      * @since   1.6
      */
-    public function getTable($type = 'ViewLevel', $prefix = 'Joomla\\CMS\\Table\\', $config = array())
+    public function getTable($type = 'ViewLevel', $prefix = 'Joomla\\CMS\\Table\\', $config = [])
     {
         $return = Table::getInstance($type, $prefix, $config);
 
@@ -155,7 +155,7 @@ public function getItem($pk = null)
         $result = parent::getItem($pk);
 
         // Convert the params field to an array.
-        $result->rules = json_decode($result->rules);
+        $result->rules = $result->rules !== null ? json_decode($result->rules) : [];
 
         return $result;
     }
@@ -170,7 +170,7 @@ public function getItem($pk = null)
      *
      * @since   1.6
      */
-    public function getForm($data = array(), $loadData = true)
+    public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_users.level', 'level', array('control' => 'jform', 'load_data' => $loadData));
@@ -193,7 +193,7 @@ public function getForm($data = array(), $loadData = true)
     protected function loadFormData()
     {
         // Check the session for previously entered form data.
-        $data = Factory::getApplication()->getUserState('com_users.edit.level.data', array());
+        $data = Factory::getApplication()->getUserState('com_users.edit.level.data', []);
 
         if (empty($data)) {
             $data = $this->getItem();
@@ -234,7 +234,7 @@ protected function preprocessForm(Form $form, $data, $group = '')
     public function save($data)
     {
         if (!isset($data['rules'])) {
-            $data['rules'] = array();
+            $data['rules'] = [];
         }
 
         $data['title'] = InputFilter::getInstance()->clean($data['title'], 'TRIM');
@@ -262,12 +262,12 @@ public function validate($form, $data, $group = null)
         // Non Super user should not be able to change the access levels of super user groups
         if (!$isSuperAdmin) {
             if (!isset($data['rules']) || !is_array($data['rules'])) {
-                $data['rules'] = array();
+                $data['rules'] = [];
             }
 
             $groups = array_values(UserGroupsHelper::getInstance()->getAll());
 
-            $rules = array();
+            $rules = [];
 
             if (!empty($data['id'])) {
                 $table = $this->getTable();

administrator/modules/mod_submenu/src/Menu/Menu.php

@@ -133,7 +133,12 @@ public static function preprocess($parent)
                 continue;
             }
 
-            if ($item->element === 'com_fields') {
+            // Exclude item if the component is not authorised
+            $assetName = $item->element;
+
+            if ($item->element === 'com_categories') {
+                $assetName = $query['extension'] ?? 'com_content';
+            } elseif ($item->element === 'com_fields') {
                 parse_str($item->link, $query);
 
                 // Only display Fields menus when enabled in the component
@@ -156,7 +161,7 @@ public static function preprocess($parent)
                 if (isset($query['extension'])) {
                     $parts = explode('.', $query['extension']);
 
-                    $workflow = ComponentHelper::getParams($parts[0])->get('workflow_enabled');
+                    $workflow = ComponentHelper::getParams($parts[0])->get('workflow_enabled') && $user->authorise('core.manage.workflow', $parts[0]);
                 }
 
                 if (!$workflow) {
@@ -184,9 +189,6 @@ public static function preprocess($parent)
                     $parent->removeChild($item);
                     continue;
                 }
-            } elseif ($item->element && !$user->authorise(($item->scope === 'edit') ? 'core.create' : 'core.manage', $item->element)) {
-                $parent->removeChild($item);
-                continue;
             } elseif ($item->element === 'com_menus') {
                 // Get badges for Menus containing a Home page.
                 $iconImage = $item->icon;
@@ -203,6 +205,11 @@ public static function preprocess($parent)
                 }
             }
 
+            if ($assetName && !$user->authorise(($item->scope === 'edit') ? 'core.create' : 'core.manage', $assetName)) {
+                $parent->removeChild($item);
+                continue;
+            }
+
             if ($item->hasChildren()) {
                 self::preprocess($item);
             }

administrator/templates/atum/error_full.php

@@ -37,18 +37,19 @@
 
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8');
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8');
+
 
     // Get the hue value
     preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
@@ -97,8 +98,8 @@
         <div class="header-title d-flex">
             <div class="d-flex align-items-center">
                 <div class="logo">
-                    <img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-                    <img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
+                    <?php echo HTMLHelper::_('image', $logoBrandLarge, $logoBrandLargeAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
+                    <?php echo HTMLHelper::_('image', $logoBrandSmall, $logoBrandSmallAlt, ['class' => 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                 </div>
             </div>
             <jdoc:include type="modules" name="title" />

administrator/templates/atum/error_login.php

@@ -35,24 +35,19 @@
 
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
-$loginLogo = $this->params->get('loginLogo')
-    ? Uri::root() . $this->params->get('loginLogo')
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/login.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8');
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
-$loginLogoAlt = empty($this->params->get('loginLogoAlt')) && empty($this->params->get('emptyLoginLogoAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8');
+
 
     // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
@@ -101,8 +96,8 @@
         <div class="header-title d-flex">
             <div class="d-flex align-items-center">
                 <div class="logo">
-                    <img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-                    <img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
+                    <?php echo HTMLHelper::_('image', $logoBrandLarge, $logoBrandLargeAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
+                    <?php echo HTMLHelper::_('image', $logoBrandSmall, $logoBrandSmallAlt, ['class' => 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                 </div>
             </div>
             <jdoc:include type="modules" name="title" />

administrator/templates/atum/index.php

@@ -45,18 +45,18 @@
 
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8');
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8');
 
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
@@ -112,13 +112,13 @@
                 <?php // No home link in edit mode (so users can not jump out) and control panel (for a11y reasons) ?>
                 <?php if ($hiddenMenu || $cpanel) : ?>
                     <div class="logo <?php echo $sidebarState === 'closed' ? 'small' : ''; ?>">
-                    <img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-                    <img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
+                        <?php echo HTMLHelper::_('image', $logoBrandLarge, $logoBrandLargeAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
+                        <?php echo HTMLHelper::_('image', $logoBrandSmall, $logoBrandSmallAlt, ['class' => 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                     </div>
                 <?php else : ?>
                     <a class="logo <?php echo $sidebarState === 'closed' ? 'small' : ''; ?>" href="<?php echo Route::_('index.php'); ?>">
-                        <img src="<?php echo $logoBrandLarge; ?>" alt="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
-                        <img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" alt="<?php echo Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'); ?>">
+                        <?php echo HTMLHelper::_('image', $logoBrandLarge, Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'), ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
+                        <?php echo HTMLHelper::_('image', $logoBrandSmall, Text::_('TPL_ATUM_BACK_TO_CONTROL_PANEL'), ['class' => 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                     </a>
                 <?php endif; ?>
             </div>

administrator/templates/atum/login.php

@@ -36,24 +36,23 @@
 
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $loginLogo = $this->params->get('loginLogo')
-    ? Uri::root() . $this->params->get('loginLogo')
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/login.svg';
+    ? Uri::root(false) . $this->params->get('loginLogo')
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/login.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
-    ? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-    : Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
+    ? Uri::root(false) . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
+    : Uri::root(false) . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8');
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? '' : htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8');
 $loginLogoAlt = empty($this->params->get('loginLogoAlt')) && empty($this->params->get('emptyLoginLogoAlt'))
-    ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
+    ? ''
+    : htmlspecialchars($this->params->get('loginLogoAlt', ''), ENT_COMPAT, 'UTF-8');
 
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);
@@ -113,8 +112,8 @@
         <div class="header-title d-flex">
             <div class="d-flex align-items-center">
                 <div class="logo">
-                    <img src="<?php echo $logoBrandLarge; ?>" <?php echo $logoBrandLargeAlt; ?>>
-                    <img class="logo-collapsed" src="<?php echo $logoBrandSmall; ?>" <?php echo $logoBrandSmallAlt; ?>>
+                    <?php echo HTMLHelper::_('image', $logoBrandLarge, $logoBrandLargeAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
+                    <?php echo HTMLHelper::_('image', $logoBrandSmall, $logoBrandSmallAlt, ['class' => 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                 </div>
             </div>
             <jdoc:include type="modules" name="title" />
@@ -131,7 +130,7 @@
                 <main class="d-flex justify-content-center align-items-center h-100">
                     <div class="login">
                         <div class="main-brand logo text-center">
-                            <img src="<?php echo $loginLogo; ?>" <?php echo $loginLogoAlt; ?>>
+                            <?php echo HTMLHelper::_('image', $loginLogo, $loginLogoAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                         </div>
                         <jdoc:include type="component" />
                     </div>