joomla · pe7er · Jan 12, 2025 · Jan 12, 2025 · Jan 12, 2025 · Jan 12, 2025
diff --git a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
@@ -59,12 +59,12 @@ protected function getOptions()
             // Construct the query
             $query = $db->getQuery(true)
                 ->select($db->quoteName('u.id', 'value'))
-                ->select($db->quoteName('u.username', 'text'))
+                ->select('CONCAT(' . $db->quoteName('u.name') . ', " (", ' . $db->quoteName('u.username') . ', ")") AS ' . $db->quoteName('text'))
                 ->from($db->quoteName('#__users', 'u'))
                 ->join('INNER', $db->quoteName('#__action_logs', 'c') . ' ON ' . $db->quoteName('c.user_id') . ' = ' . $db->quoteName('u.id'))
                 ->group($db->quoteName('u.id'))
                 ->group($db->quoteName('u.username'))
-                ->order($db->quoteName('u.username'));
+                ->order($db->quoteName('u.name'));
 
             // Setup the query
             $db->setQuery($query);

diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -408,7 +408,16 @@ public function loadChangelog($eid, $source)
                     ]
                 )
             )
-            ->select($db->quoteName('updates.version', 'updateVersion'))
+            ->select($db->quoteName(
+                [
+                    'updates.version',
+                    'updates.changelogurl',
+                ],
+                [
+                    'updateVersion',
+                    'updateChangelogUrl',
+                ]
+            ))
             ->from($db->quoteName('#__extensions', 'extensions'))
             ->join(
                 'LEFT',
@@ -423,13 +432,15 @@ public function loadChangelog($eid, $source)
         $this->translate($extensions);
         $extension = array_shift($extensions);
 
-        if (!$extension->changelogurl) {
+        $changelogurl = $source === 'manage' ? $extension->changelogurl : $extension->updateChangelogUrl;
+
+        if (!$changelogurl) {
             return '';
         }
 
         $changelog = new Changelog();
         $changelog->setVersion($source === 'manage' ? $extension->version : $extension->updateVersion);
-        $changelog->loadFromXml($extension->changelogurl);
+        $changelog->loadFromXml($changelogurl);
 
         // Read all the entries
         $entries = [

diff --git a/administrator/components/com_mails/src/Helper/MailsHelper.php b/administrator/components/com_mails/src/Helper/MailsHelper.php
@@ -82,6 +82,10 @@ public static function loadTranslationFiles($extension, $language = 'en-GB')
             case 'com':
             default:
                 $source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+
+                $lang->load($extension, JPATH_BASE, $language, true)
+                || $lang->load($extension, JPATH_BASE . '/components/' . $extension, $language, true);
+
                 break;
 
             case 'mod':

diff --git a/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/...istrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
@@ -30,8 +30,31 @@
               type="text"
               required
               autocomplete="off"
+              v-bind:class="(isValidName()!==0 && isValid())?'is-invalid':''"
+              aria-describedby="folderFeedback"
               @input="folder = $event.target.value"
             >
+            <div
+              v-if="isValidName()===1"
+              id="folderFeedback"
+              class="invalid-feedback"
+            >
+              {{ translate('COM_MEDIA_CREATE_NEW_FOLDER_RELATIVE_PATH_ERROR') }}
+            </div>
+            <div
+              v-if="isValidName()===2"
+              id="folderFeedback"
+              class="invalid-feedback"
+            >
+              {{ translate('COM_MEDIA_CREATE_NEW_FOLDER_EXISTING_FOLDER_ERROR') }}
+            </div>
+            <div
+              v-if="isValidName()===3 && isValid()"
+              id="folderFeedback"
+              class="invalid-feedback"
+            >
+              {{ translate('COM_MEDIA_CREATE_NEW_FOLDER_UNEXPECTED_CHARACTER') }}
+            </div>
           </div>
         </form>
       </div>
@@ -46,7 +69,7 @@
         </button>
         <button
           class="btn btn-success"
-          :disabled="!isValid()"
+          :disabled="!isValid() || isValidName()!==0"
           @click="save()"
         >
           {{ translate('JACTION_CREATE') }}
@@ -70,6 +93,15 @@ export default {
       folder: '',
     };
   },
+  computed: {
+    /* Get the contents of the currently selected directory */
+    items() {
+      const directories = this.$store.getters.getSelectedDirectoryDirectories;
+      const files = this.$store.getters.getSelectedDirectoryFiles;
+
+      return [...directories, ...files];
+    },
+  },
   watch: {
     '$store.state.showCreateFolderModal': function (show) {
       this.$nextTick(() => {
@@ -79,11 +111,25 @@ export default {
       });
     },
   },
+
   methods: {
     /* Check if the form is valid */
     isValid() {
       return (this.folder);
     },
+    /* Check folder name is valid or not */
+    isValidName() {
+      if (this.folder.includes('..')) {
+        return 1;
+      }
+      if ((this.items.filter((file) => file.name.toLowerCase() === (this.folder.toLowerCase())).length !== 0)) {
+        return 2;
+      }
+      if ((!/^[\p{L}\p{N}\-_. ]+$/u.test(this.folder))) {
+        return 3;
+      }
+      return 0;
+    },
     /* Close the modal instance */
     close() {
       this.reset();

diff --git a/administrator/components/com_media/tmpl/media/default_texts.php b/administrator/components/com_media/tmpl/media/default_texts.php
@@ -28,6 +28,9 @@
     'COM_MEDIA_CREATE_NEW_FOLDER',
     'COM_MEDIA_CREATE_NEW_FOLDER_ERROR',
     'COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS',
+    'COM_MEDIA_CREATE_NEW_FOLDER_EXISTING_FOLDER_ERROR',
+    'COM_MEDIA_CREATE_NEW_FOLDER_RELATIVE_PATH_ERROR',
+    'COM_MEDIA_CREATE_NEW_FOLDER_UNEXPECTED_CHARACTER',
     'COM_MEDIA_DECREASE_GRID',
     'COM_MEDIA_DELETE_ERROR',
     'COM_MEDIA_DELETE_SUCCESS',

diff --git a/administrator/components/com_users/src/Helper/DebugHelper.php b/administrator/components/com_users/src/Helper/DebugHelper.php
@@ -85,6 +85,10 @@ public static function getDebugActions($component = null)
             $component_actions = Access::getActionsFromFile(JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml');
 
             if (!empty($component_actions)) {
+                // Load language
+                $lang      = Factory::getApplication()->getLanguage();
+                $lang->load($component, JPATH_ADMINISTRATOR, null, false, false);
+
                 foreach ($component_actions as &$action) {
                     $descr = (string) $action->title;
 

diff --git a/administrator/components/com_users/tmpl/debuggroup/default.php b/administrator/components/com_users/tmpl/debuggroup/default.php
@@ -36,6 +36,8 @@
         <?php else : ?>
             <?php
             // Split the actions table
+            $loginActions = [];
+            $actions      = [];
             foreach ($this->actions as $action) :
                 $name = $action[0];
                 if (in_array($name, ['core.login.site', 'core.login.admin', 'core.login.offline', 'core.login.api', 'core.admin'])) :

diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php
@@ -20,9 +20,6 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
-$loginActions = [];
-$actions = [];
-
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('table.columns');
@@ -39,6 +36,8 @@
         <?php else : ?>
             <?php
             // Split the actions table
+            $loginActions = [];
+            $actions      = [];
             foreach ($this->actions as $action) :
                 $name = $action[0];
                 if (in_array($name, ['core.login.site', 'core.login.admin', 'core.login.api', 'core.login.offline'])) :

diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini
@@ -25,6 +25,9 @@ COM_MEDIA_COPY_FOLDER_NOT_POSSIBLE="Copy folder is not possible"
 COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder"
 COM_MEDIA_CREATE_NEW_FOLDER_ERROR="Error creating folder."
 COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created."
+COM_MEDIA_CREATE_NEW_FOLDER_EXISTING_FOLDER_ERROR="Folder or file name already exists "
+COM_MEDIA_CREATE_NEW_FOLDER_RELATIVE_PATH_ERROR="Use of relative paths not permitted"
+COM_MEDIA_CREATE_NEW_FOLDER_UNEXPECTED_CHARACTER="Only Alphanumeric ,underscore(_),hyphen(-) and  peroid(.) are allowed"
 COM_MEDIA_DECREASE_GRID="Decrease grid size"
 COM_MEDIA_DELETE_ERROR="Error deleting the item."
 COM_MEDIA_DELETE_NOT_POSSIBLE="Delete not possible!"

diff --git a/build/media_source/com_content/js/form-edit.es6.js b/build/media_source/com_content/js/form-edit.es6.js
@@ -25,7 +25,7 @@
     document.querySelectorAll(`[${buttonDataSelector}]`).forEach((button) => {
       button.addEventListener('click', (e) => {
         e.preventDefault();
-        const task = e.target.getAttribute(buttonDataSelector);
+        const task = button.getAttribute(buttonDataSelector);
         submitTask(task);
       });
     });

diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
@@ -3,7 +3,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-if (Joomla && Joomla.getOptions('js-extensions-update')) {
+if (Joomla && Joomla.getOptions('js-joomla-update')) {
   const update = (type, text) => {
     const link = document.getElementById('plg_quickicon_joomlaupdate');
     if (link) {

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
@@ -7,6 +7,12 @@
   @media screen and (prefers-reduced-motion: reduce) {
     scroll-behavior: auto;
   }
+
+  &:has(.sticky-top) {
+    [id] {
+      scroll-margin-top: var(--cassiopeia-scroll-margin-top, 10rem);
+    }
+  }
 }
 
 html {

diff --git a/components/com_finder/src/Service/Router.php b/components/com_finder/src/Service/Router.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Component\Router\RouterViewConfiguration;
 use Joomla\CMS\Component\Router\Rules\MenuRules;
 use Joomla\CMS\Component\Router\Rules\NomenuRules;
-use Joomla\CMS\Component\Router\Rules\StandardRules;
 use Joomla\CMS\Menu\AbstractMenu;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -43,7 +42,37 @@ public function __construct(SiteApplication $app, AbstractMenu $menu)
         parent::__construct($app, $menu);
 
         $this->attachRule(new MenuRules($this));
-        $this->attachRule(new StandardRules($this));
         $this->attachRule(new NomenuRules($this));
     }
+
+    /**
+     * Build method for URLs
+     *
+     * @param   array  &$query  Array of query elements
+     *
+     * @return  array  Array of URL segments
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function build(&$query)
+    {
+        $segments = [];
+
+        // Process the parsed variables based on custom defined rules
+        foreach ($this->rules as $rule) {
+            $rule->build($query, $segments);
+        }
+
+        if (isset($query['Itemid'])) {
+            $item = $this->menu->getItem($query['Itemid']);
+
+            if ($query['option'] == 'com_finder' && isset($query['f']) && isset($item->query['f']) && $query['f'] == $item->query['f']) {
+                unset($query['f']);
+            }
+        }
+
+        unset($query['view']);
+
+        return $segments;
+    }
 }
diff --git a/components/com_users/src/Controller/CallbackController.php b/components/com_users/src/Controller/CallbackController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package     Joomla.Administrator
+ * @package     Joomla.Site
  * @subpackage  com_users
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Controller/CaptiveController.php b/components/com_users/src/Controller/CaptiveController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package     Joomla.Administrator
+ * @package     Joomla.Site
  * @subpackage  com_users
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Controller/MethodController.php b/components/com_users/src/Controller/MethodController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package     Joomla.Administrator
+ * @package     Joomla.Site
  * @subpackage  com_users
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Controller/MethodsController.php b/components/com_users/src/Controller/MethodsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package     Joomla.Administrator
+ * @package     Joomla.Site
  * @subpackage  com_users
  *
  * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Dispatcher/Dispatcher.php b/components/com_users/src/Dispatcher/Dispatcher.php
@@ -2,7 +2,7 @@
 
 /**
  * @package     Joomla.Site
- * @subpackage  com_privacy
+ * @subpackage  com_users
  *
  * @copyright   (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
@@ -19,7 +19,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * ComponentDispatcher class for com_privacy
+ * ComponentDispatcher class for com_users
  *
  * @since  5.2.3
  */
@@ -43,7 +43,7 @@ protected function checkAccess()
         switch ($view) {
             case 'registration':
                 // If the user is already logged in, redirect to the profile page.
-                if ($user->get('guest') != 1) {
+                if ($user->guest != 1) {
                     // Redirect to profile page.
                     $this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
                 }
@@ -57,15 +57,15 @@ protected function checkAccess()
 
                 // Handle view specific models.
             case 'profile':
-                if ($user->get('guest') == 1) {
+                if ($user->guest == 1) {
                     // Redirect to login page.
                     $this->app->redirect(Route::_('index.php?option=com_users&view=login', false));
                 }
                 break;
 
             case 'remind':
             case 'reset':
-                if ($user->get('guest') != 1) {
+                if ($user->guest != 1) {
                     // Redirect to profile page.
                     $this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
                 }

diff --git a/components/com_users/src/Model/BackupcodesModel.php b/components/com_users/src/Model/BackupcodesModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package    Joomla.Administrator
+ * @package    Joomla.Site
  * @subpackage com_users
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Model/CaptiveModel.php b/components/com_users/src/Model/CaptiveModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package    Joomla.Administrator
+ * @package    Joomla.Site
  * @subpackage com_users
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Model/MethodModel.php b/components/com_users/src/Model/MethodModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package    Joomla.Administrator
+ * @package    Joomla.Site
  * @subpackage com_users
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>

diff --git a/components/com_users/src/Model/MethodsModel.php b/components/com_users/src/Model/MethodsModel.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package    Joomla.Administrator
+ * @package    Joomla.Site
  * @subpackage com_users
  *
  * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>