Joomla! 5.2.3

joomla · Dec 21, 2024 · ac793f3 · ac793f3
1 parent 56c8b84
commit ac793f3
Show file tree

Hide file tree

Showing 19 changed files with 143 additions and 84 deletions.
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.2.3-dev</version>
-	<creationDate>2024-12</creationDate>
+	<version>5.2.3</version>
+	<creationDate>2025-01</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.2.3.1</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php
@@ -22,7 +22,7 @@
 $html = HTMLHelper::_('icons.buttons', $buttons);
 ?>
 <?php if (!empty($html)) : ?>
-    <nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . $module->title; ?>">
+    <nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
         <ul class="nav flex-wrap">
             <?php echo $html; ?>
         </ul>

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/components/com_privacy/src/Controller/DisplayController.php b/components/com_privacy/src/Controller/DisplayController.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Privacy\Site\Controller;
 
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -39,15 +38,6 @@ public function display($cachable = false, $urlparams = [])
     {
         $view = $this->input->get('view', $this->default_view);
 
-        // Submitting information requests and confirmation through the frontend is restricted to authenticated users at this time
-        if (\in_array($view, ['confirm', 'request']) && $this->app->getIdentity()->guest) {
-            $this->setRedirect(
-                Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=' . $view), false)
-            );
-
-            return $this;
-        }
-
         // Set a Referrer-Policy header for views which require it
         if (\in_array($view, ['confirm', 'remind'])) {
             $this->app->setHeader('Referrer-Policy', 'no-referrer', true);

diff --git a/components/com_privacy/src/Dispatcher/Dispatcher.php b/components/com_privacy/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Privacy\Site\Dispatcher;
+
+use Joomla\CMS\Dispatcher\ComponentDispatcher;
+use Joomla\CMS\Router\Route;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * ComponentDispatcher class for com_privacy
+ *
+ * @since  5.2.3
+ */
+class Dispatcher extends ComponentDispatcher
+{
+    /**
+     * Method to check component access permission
+     *
+     * @since   5.2.3
+     *
+     * @return  void
+     */
+    protected function checkAccess()
+    {
+        parent::checkAccess();
+
+        $view = $this->input->get('view');
+
+        // Submitting information requests and confirmation through the frontend is restricted to authenticated users at this time
+        if (\in_array($view, ['confirm', 'request']) && $this->app->getIdentity()->guest) {
+            $this->app->redirect(
+                Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_privacy&view=' . $view), false)
+            );
+        }
+    }
+}
diff --git a/components/com_users/src/Controller/DisplayController.php b/components/com_users/src/Controller/DisplayController.php
@@ -10,9 +10,7 @@
 
 namespace Joomla\Component\Users\Site\Controller;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Router\Route;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -50,61 +48,11 @@ public function display($cachable = false, $urlparams = false)
         if ($view = $this->getView($vName, $vFormat)) {
             // Do any specific processing by view.
             switch ($vName) {
-                case 'registration':
-                    // If the user is already logged in, redirect to the profile page.
-                    $user = $this->app->getIdentity();
-
-                    if ($user->guest != 1) {
-                        // Redirect to profile page.
-                        $this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
-
-                        return;
-                    }
-
-                    // Check if user registration is enabled
-                    if (ComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0) {
-                        // Registration is disabled - Redirect to login page.
-                        $this->setRedirect(Route::_('index.php?option=com_users&view=login', false));
-
-                        return;
-                    }
-
-                    // The user is a guest, load the registration model and show the registration page.
-                    $model = $this->getModel('Registration');
-                    break;
-
-                case 'profile':
-                    // Handle view specific models.
-                    // If the user is a guest, redirect to the login page.
-                    $user = $this->app->getIdentity();
-
-                    if ($user->guest == 1) {
-                        // Redirect to login page.
-                        $this->setRedirect(Route::_('index.php?option=com_users&view=login', false));
-
-                        return;
-                    }
-
-                    $model = $this->getModel($vName);
-                    break;
-
-                case 'login':
-                    // Handle the default views.
-                    $model = $this->getModel($vName);
-                    break;
-
                 case 'remind':
                 case 'reset':
-                    // If the user is already logged in, redirect to the profile page.
-                    $user = $this->app->getIdentity();
-
-                    if ($user->guest != 1) {
-                        // Redirect to profile page.
-                        $this->setRedirect(Route::_('index.php?option=com_users&view=profile', false));
-
-                        return;
-                    }
-
+                case 'registration':
+                case 'login':
+                case 'profile':
                     $model = $this->getModel($vName);
                     break;
 

diff --git a/components/com_users/src/Dispatcher/Dispatcher.php b/components/com_users/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_privacy
+ *
+ * @copyright   (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Users\Site\Dispatcher;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Dispatcher\ComponentDispatcher;
+use Joomla\CMS\Router\Route;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * ComponentDispatcher class for com_privacy
+ *
+ * @since  5.2.3
+ */
+class Dispatcher extends ComponentDispatcher
+{
+    /**
+     * Method to check component access permission
+     *
+     * @since   5.2.3
+     *
+     * @return  void
+     */
+    protected function checkAccess()
+    {
+        parent::checkAccess();
+
+        $view = $this->input->get('view');
+        $user = $this->app->getIdentity();
+
+        // Do any specific processing by view.
+        switch ($view) {
+            case 'registration':
+                // If the user is already logged in, redirect to the profile page.
+                if ($user->get('guest') != 1) {
+                    // Redirect to profile page.
+                    $this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
+                }
+
+                // Check if user registration is enabled
+                if (ComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0) {
+                    // Registration is disabled - Redirect to login page.
+                    $this->app->redirect(Route::_('index.php?option=com_users&view=login', false));
+                }
+                break;
+
+                // Handle view specific models.
+            case 'profile':
+                if ($user->get('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) {
+                    // Redirect to profile page.
+                    $this->app->redirect(Route::_('index.php?option=com_users&view=profile', false));
+                }
+        }
+    }
+}
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>5.2.3</version>
-	<creationDate>2024-12</creationDate>
+	<creationDate>2025-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/layouts/chromes/html5.php b/layouts/chromes/html5.php
@@ -47,7 +47,7 @@
         $moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
         $headerAttribs['id']              = 'mod-' . $module->id;
     else :
-        $moduleAttribs['aria-label'] = $module->title;
+        $moduleAttribs['aria-label'] = htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8');
     endif;
 }
 

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -66,15 +66,15 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = '';
 
     /**
      * Development status.
      *
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Stable';
 
     /**
      * Code name.
@@ -90,15 +90,15 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '31-December-2024';
+    public const RELDATE = '7-January-2025';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:01';
+    public const RELTIME = '16:00';
 
     /**
      * Release timezone.

diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
@@ -19,7 +19,7 @@
 $id = '';
 
 if ($tagId = $params->get('tag_id', '')) {
-    $id = ' id="' . $tagId . '"';
+    $id = ' id="' . htmlspecialchars($tagId, ENT_QUOTES, 'UTF-8') . '"';
 }
 
 // The menu class is deprecated. Use mod-menu instead

diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -44,7 +44,7 @@
         $moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
         $headerAttribs['id']              = 'mod-' . $module->id;
     else :
-        $moduleAttribs['aria-label'] = $module->title;
+        $moduleAttribs['aria-label'] = htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8');
     endif;
 }
 

diff --git a/templates/cassiopeia/html/layouts/chromes/noCard.php b/templates/cassiopeia/html/layouts/chromes/noCard.php
@@ -38,7 +38,7 @@
         $moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
         $headerAttribs['id']              = 'mod-' . $module->id;
     else :
-        $moduleAttribs['aria-label'] = $module->title;
+        $moduleAttribs['aria-label'] = htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8');
     endif;
 }