[5.3] Upmerge 2024-10-03

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -274,6 +274,12 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
      */
     public static function loadActionLogPluginsLanguage()
     {
+        static $loaded;
+        if ($loaded) {
+            return;
+        }
+        $loaded = true;
+
         $lang = Factory::getLanguage();
         $db   = Factory::getDbo();
 

administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-17.sql

@@ -0,0 +1,8 @@
+UPDATE `#__guidedtour_steps`
+SET `ordering` = `ordering` + 1
+WHERE `title` IN ('COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE');
+
+INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`, `ordering`)
+SELECT 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_DESCRIPTION', 'bottom', '#jform_autostart0', 2, 3, '', 1, '*', '', `tour_id`, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, `ordering` + 1
+  FROM `#__guidedtour_steps`
+ WHERE `title` = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE';

administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-19.sql

@@ -1,7 +1,7 @@
 --
 -- Add the Guided Tours selectable option to the User Action Logs
 --
-INSERT INTO "#__action_logs_extensions" ("extension") VALUES ("com_guidedtours");
+INSERT INTO "#__action_logs_extensions" ("extension") VALUES ('com_guidedtours');
 
 INSERT INTO "#__action_log_config" ("type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
 ('guidedtour', 'com_guidedtours.state', 'id', 'title', '#__guidedtours', 'PLG_ACTIONLOG_JOOMLA');

administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-17.sql

@@ -0,0 +1,8 @@
+UPDATE "#__guidedtour_steps"
+SET "ordering" = "ordering" + 1
+WHERE "title" IN ('COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE');
+
+INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "tour_id", "created", "created_by", "modified", "modified_by", "ordering")
+SELECT 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_DESCRIPTION', 'bottom', '#jform_autostart0', 2, 3, '', 1, '*', '', "tour_id", CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, "ordering" + 1
+  FROM "#__guidedtour_steps"
+ WHERE "title" = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE';

administrator/components/com_guidedtours/config.xml

@@ -17,11 +17,13 @@
 
 		<field
 			name="delayed_time"
-			type="text"
+			type="number"
 			label="COM_GUIDEDTOURS_CONFIG_DELAYED_TIME_LABEL"
 			description="COM_GUIDEDTOURS_CONFIG_DELAYED_TIME_DESCRIPTION"
 			default="60"
-			size="small"
+			min="1"
+			filter="integer"
+			validate="number"
 			showon="allowTourAutoStart:1"
 		/>
 	</fieldset>

administrator/components/com_guidedtours/src/Controller/AjaxController.php

@@ -38,87 +38,90 @@ public function fetchUserState()
         $user = $this->app->getIdentity();
 
         $tourId     = $this->app->input->getInt('tid', 0);
-        $stepNumber = $this->app->input->getString('sid', '');
+        $stepNumber = $this->app->input->getInt('sid', 0);
         $context    = $this->app->input->getString('context', '');
 
-        if ($user != null && $user->id > 0) {
-            $actionState = '';
-
-            switch ($context) {
-                case 'tour.complete':
-                    $actionState = 'completed';
-                    break;
-                case 'tour.cancel':
-                    $actionState = 'delayed';
-                    break;
-                case 'tour.skip':
-                    $actionState = 'skipped';
-                    break;
-            }
+        if ($user == null || $user->id <= 0) {
+            echo new JsonResponse(['success' => false, 'tourId' => $tourId], Text::_('COM_GUIDEDTOURS_USERSTATE_CONNECTEDONLY'), true);
+            $this->app->close();
+        }
+
+        if (!\in_array($context, ['tour.complete', 'tour.cancel', 'tour.skip'])) {
+            echo new JsonResponse(['success' => false, 'tourId' => $tourId], Text::_('COM_GUIDEDTOURS_USERSTATE_WRONGCONTEXT'), true);
+            $this->app->close();
+        }
 
-            PluginHelper::importPlugin('guidedtours');
-
-            // event onBeforeTourSaveUserState before save user tour state
-            $beforeEvent = AbstractEvent::create(
-                'onBeforeTourSaveUserState',
-                [
-                    'subject'     => new \stdClass(),
-                    'tourId'      => $tourId,
-                    'actionState' => $actionState,
-                    'stepNumber'  => $stepNumber,
-                ]
-            );
-
-            $this->app->getDispatcher()->dispatch('onBeforeTourSaveUserState', $beforeEvent);
-
-            // Save the tour state only when the tour auto-starts.
-            $tourModel = $this->getModel('Tour', 'Administrator');
-            if ($tourModel->isAutostart($tourId)) {
-                $result = $tourModel->saveTourUserState($tourId, $actionState);
-                if ($result) {
-                    $message = Text::sprintf('COM_GUIDEDTOURS_USERSTATE_STATESAVED', $user->id, $tourId);
-                } else {
-                    $message = Text::sprintf('COM_GUIDEDTOURS_USERSTATE_STATENOTSAVED', $user->id, $tourId);
-                }
+        if ($tourId <= 0) {
+            echo new JsonResponse(['success' => false, 'tourId' => $tourId], Text::_('COM_GUIDEDTOURS_USERSTATE_BADTOURID'), true);
+            $this->app->close();
+        }
+
+        $actionState = '';
+
+        switch ($context) {
+            case 'tour.complete':
+                $actionState = 'completed';
+                break;
+            case 'tour.cancel':
+                $actionState = 'delayed';
+                break;
+            case 'tour.skip':
+                $actionState = 'skipped';
+                break;
+        }
+
+        PluginHelper::importPlugin('guidedtours');
+
+        // event onBeforeTourSaveUserState before save user tour state
+        $beforeEvent = AbstractEvent::create(
+            'onBeforeTourSaveUserState',
+            [
+                'subject'     => new \stdClass(),
+                'tourId'      => $tourId,
+                'actionState' => $actionState,
+                'stepNumber'  => $stepNumber,
+            ]
+        );
+
+        $this->app->getDispatcher()->dispatch('onBeforeTourSaveUserState', $beforeEvent);
+
+        // Save the tour state only when the tour auto-starts.
+        $tourModel = $this->getModel('Tour', 'Administrator');
+        if ($tourModel->isAutostart($tourId)) {
+            $result = $tourModel->saveTourUserState($tourId, $actionState);
+            if ($result) {
+                $message = Text::sprintf('COM_GUIDEDTOURS_USERSTATE_STATESAVED', $user->id, $tourId);
             } else {
-                $result  = false;
                 $message = Text::sprintf('COM_GUIDEDTOURS_USERSTATE_STATENOTSAVED', $user->id, $tourId);
             }
-
-            // event onAfterTourSaveUserState after save user tour state (may override message)
-            $afterEvent = AbstractEvent::create(
-                'onAfterTourSaveUserState',
-                [
-                    'subject'     => new \stdClass(),
-                    'tourId'      => $tourId,
-                    'actionState' => $actionState,
-                    'stepNumber'  => $stepNumber,
-                    'result'      => $result,
-                    'message'     => &$message,
-                ]
-            );
-
-            $this->app->getDispatcher()->dispatch('onAfterTourSaveUserState', $afterEvent);
-
-            // Construct the response data
-            $data = [
-                'tourId'  => $tourId,
-                'stepId'  => $stepNumber,
-                'context' => $context,
-                'state'   => $actionState,
-            ];
-            echo new JsonResponse($data, $message);
-            $this->app->close();
         } else {
-            // Construct the response data
-            $data = [
-                'success' => false,
-                'tourId'  => $tourId,
-            ];
-
-            $message = Text::_('COM_GUIDEDTOURS_USERSTATE_CONNECTEDONLY');
-            echo new JsonResponse($data, $message, true);
-            $this->app->close();
+            $result  = false;
+            $message = Text::sprintf('COM_GUIDEDTOURS_USERSTATE_STATENOTSAVED', $user->id, $tourId);
         }
+
+        // event onAfterTourSaveUserState after save user tour state (may override message)
+        $afterEvent = AbstractEvent::create(
+            'onAfterTourSaveUserState',
+            [
+                'subject'     => new \stdClass(),
+                'tourId'      => $tourId,
+                'actionState' => $actionState,
+                'stepNumber'  => $stepNumber,
+                'result'      => $result,
+                'message'     => &$message,
+            ]
+        );
+
+        $this->app->getDispatcher()->dispatch('onAfterTourSaveUserState', $afterEvent);
+
+        // Construct the response data
+        $data = [
+            'tourId'  => $tourId,
+            'stepId'  => $stepNumber,
+            'context' => $context,
+            'state'   => $actionState,
+        ];
+        echo new JsonResponse($data, $message);
+        $this->app->close();
     }
 }

administrator/components/com_guidedtours/src/Dispatcher/Dispatcher.php

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_guidedtours
+ *
+ * @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\Guidedtours\Administrator\Dispatcher;
+
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Joomla\CMS\Dispatcher\ComponentDispatcher;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * ComponentDispatcher class for com_guidedtours
+ *
+ * @since  5.2.0
+ */
+class Dispatcher extends ComponentDispatcher
+{
+    /**
+     * Method to check component access permission
+     *
+     * @return  void
+     *
+     * @throws  \Exception|NotAllowed
+     */
+    protected function checkAccess()
+    {
+        $command = $this->input->getCmd('task', 'display');
+        if ($this->app->isClient('administrator') && $command == 'ajax.fetchUserState') {
+            return;
+        }
+
+        parent::checkAccess();
+    }
+}

administrator/components/com_media/src/Controller/ApiController.php

@@ -270,7 +270,7 @@ public function putFiles()
         $move         = $content->get('move', true);
 
         if ($mediaContent != null) {
-            $this->checkContent();
+            $this->checkFileSize(\strlen($mediaContent));
 
             $this->getModel()->updateFile($adapter, $name, str_replace($name, '', $path), $mediaContent);
         }

administrator/components/com_menus/src/Model/ItemModel.php

@@ -998,7 +998,7 @@ protected function populateState()
 
         $this->setState('item.type', $type);
 
-        $link = $app->isClient('api') ? $app->getInput()->get('link') :
+        $link = $app->isClient('api') ? $app->getInput()->get('link', null, 'string') :
             $app->getUserState('com_menus.edit.item.link');
 
         if ($link) {

administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php

@@ -93,12 +93,46 @@ private function getFromTask(string $property, $default = null)
      */
     public function nextExec(bool $string = true, bool $basisNow = false)
     {
-        // Exception handling here
-        switch ($this->type) {
-            case 'interval':
-                $lastExec = Factory::getDate($basisNow ? 'now' : $this->getFromTask('last_execution'), 'UTC');
-                $interval = new \DateInterval($this->rule->exp);
-                $nextExec = $lastExec->add($interval);
+        $executionRules = $this->getFromTask('execution_rules');
+        $type           = $executionRules['rule-type'];
+        switch ($type) {
+            case 'interval-minutes':
+                $now             = Factory::getDate('now', 'UTC');
+                $intervalMinutes = (int) $executionRules['interval-minutes'];
+                $interval        = new \DateInterval('PT' . $intervalMinutes . 'M');
+                $nextExec        = $now->add($interval);
+                $nextExec        = $string ? $nextExec->toSql() : $nextExec;
+                break;
+            case 'interval-hours':
+                $now           = Factory::getDate('now', 'UTC');
+                $intervalHours = $executionRules['interval-hours'];
+                $interval      = new \DateInterval('PT' . $intervalHours . 'H');
+                $nextExec      = $now->add($interval);
+                $nextExec      = $string ? $nextExec->toSql() : $nextExec;
+                break;
+            case 'interval-days':
+                $now                 = Factory::getDate('now', 'UTC');
+                $intervalDays        = $executionRules['interval-days'];
+                $interval            = new \DateInterval('P' . $intervalDays . 'D');
+                $nextExec            = $now->add($interval);
+                $execTime            = $executionRules['exec-time'];
+                list($hour, $minute) = explode(':', $execTime);
+                $nextExec->setTime($hour, $minute);
+                $nextExec = $string ? $nextExec->toSql() : $nextExec;
+                break;
+            case 'interval-months':
+                $now            = Factory::getDate('now', 'UTC');
+                $intervalMonths = $executionRules['interval-months'];
+                $interval       = new \DateInterval('P' . $intervalMonths . 'M');
+                $nextExec       = $now->add($interval);
+                $execDay        = $executionRules['exec-day'];
+                $nextExecYear   = $nextExec->format('Y');
+                $nextExecMonth  = $nextExec->format('n');
+                $nextExec->setDate($nextExecYear, $nextExecMonth, $execDay);
+
+                $execTime            = $executionRules['exec-time'];
+                list($hour, $minute) = explode(':', $execTime);
+                $nextExec->setTime($hour, $minute);
                 $nextExec = $string ? $nextExec->toSql() : $nextExec;
                 break;
             case 'cron-expression':

administrator/components/com_scheduler/src/Model/TaskModel.php

@@ -415,7 +415,7 @@ public function getTask(array $options = []): ?\stdClass
      *
      * @param \JDatabaseDriver $db The database driver to use.
      * @return bool True if there are running tasks, false otherwise.
-     * @since __DEPLOY_VERSION__
+     * @since 4.4.9
      */
     private function hasRunningTasks($db): bool
     {
@@ -445,7 +445,7 @@ private function hasRunningTasks($db): bool
      *                      - allowDisabled: Whether to allow disabled tasks.
      *                      - id: The ID of the task.
      * @return Query The lock query.
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.0
      */
     private function buildLockQuery($db, $now, $options)
     {
@@ -489,7 +489,7 @@ static function (TaskOption $taskOption): string {
      *                       - allowDisabled: Whether to allow disabled tasks.
      * @return array The ID of the next task, or an empty array if no task is found.
      *
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.0
      * @throws \RuntimeException If there is an error executing the query.
      */
     private function getNextTaskId($db, $now, $options)
@@ -537,7 +537,7 @@ static function (TaskOption $taskOption): string {
      * @param \JDatabaseDriver $db The database driver to use.
      * @param string $now The current time in the database's time format.
      * @return \stdClass|null The fetched task object, or null if no task was found.
-     * @since __DEPLOY_VERSION__
+     * @since 5.2.0
      * @throws \RuntimeException If there was an error executing the query.
      */
     private function fetchTask($db, $now): ?\stdClass

administrator/language/en-GB/com_guidedtours.ini

@@ -94,7 +94,10 @@ COM_GUIDEDTOURS_TYPE_REDIRECT_URL_DESC="Enter the relative URL of the page you w
 COM_GUIDEDTOURS_TYPE_REDIRECT_URL_LABEL="Relative URL"
 COM_GUIDEDTOURS_URL_LABEL="Relative URL"
 COM_GUIDEDTOURS_URL_DESC="Enter the relative URL of the page from where you want to Start the tour, e.g administrator/index.php?option=com_guidedtours&view=tours for the tours' list page."
-COM_GUIDEDTOURS_USERSTATE_CONNECTEDONLY="Tour User state action is only for connected users."
-COM_GUIDEDTOURS_USERSTATE_STATENOTSAVED="Tour User state not saved for user %1$s tour %2$s."
-COM_GUIDEDTOURS_USERSTATE_STATESAVED="Tour User state saved for user %1$s tour %2$s."
+COM_GUIDEDTOURS_USERSTATE_BADTOURID="The Tour needs to have a positive id."
+; 'Tour User states' are conditions in which a guided tour user leaves a tour, either by cancelling, completing or skipping a tour.
+COM_GUIDEDTOURS_USERSTATE_CONNECTEDONLY="The recording of User states for a tour is only available to logged-in users."
+COM_GUIDEDTOURS_USERSTATE_STATENOTSAVED="The User state was not saved for user %1$s tour %2$s."
+COM_GUIDEDTOURS_USERSTATE_STATESAVED="The User state was saved for user %1$s tour %2$s."
+COM_GUIDEDTOURS_USERSTATE_WRONGCONTEXT="The Tour User state context is incorrect."
 COM_GUIDEDTOURS_XML_DESCRIPTION="Component for managing Guided Tours functionality."