Merge pull request joomla#44695 from softforge/upmerges/2025-01-08

[6.0] Upmerges - 2025-01-08

Author: softforge

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -126,7 +126,7 @@ protected function sendNotificationEmails($messages, $username, $context)
         $query = $db->getQuery(true);
 
         $query
-            ->select($db->quoteName(['u.email', 'l.extensions']))
+            ->select($db->quoteName(['u.email', 'u.username', 'l.extensions', 'l.exclude_self']))
             ->from($db->quoteName('#__users', 'u'))
             ->where($db->quoteName('u.block') . ' = 0')
             ->join(
@@ -142,6 +142,10 @@ protected function sendNotificationEmails($messages, $username, $context)
         $recipients = [];
 
         foreach ($users as $user) {
+            if ($user->username === $this->getCurrentUser()->username && $user->exclude_self) {
+                continue;
+            }
+
             $extensions = json_decode($user->extensions, true);
 
             if ($extensions && \in_array(strtok($context, '.'), $extensions)) {

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -299,6 +299,19 @@ public function save($data)
             'prefix'   => $data['dbprefix'],
         ];
 
+        // Validate database name
+        if (\in_array($options['driver'], ['pgsql', 'postgresql']) && !preg_match('#^[a-zA-Z_][0-9a-zA-Z_$]*$#', $options['database'])) {
+            $app->enqueueMessage(Text::_('COM_CONFIG_FIELD_DATABASE_NAME_INVALID_MSG_POSTGRES'), 'warning');
+
+            return false;
+        }
+
+        if (\in_array($options['driver'], ['mysql', 'mysqli']) && preg_match('#[\\\\\/]#', $options['database'])) {
+            $app->enqueueMessage(Text::_('COM_CONFIG_FIELD_DATABASE_NAME_INVALID_MSG_MYSQL'), 'warning');
+
+            return false;
+        }
+
         if ((int) $data['dbencryption'] !== 0) {
             $options['ssl'] = [
                 'enable'             => true,

administrator/components/com_contact/tmpl/contacts/default_batch_body.php

@@ -48,11 +48,6 @@
                 <?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
             </div>
         </div>
-        <div class="form-group col-md-6">
-            <div class="controls">
-                <?php echo LayoutHelper::render('joomla.html.batch.user', ['noUser' => $noUser]); ?>
-            </div>
-        </div>
     </div>
 </div>
 <div class="btn-toolbar p-3">

administrator/components/com_finder/src/View/Index/HtmlView.php

@@ -112,6 +112,15 @@ class HtmlView extends BaseHtmlView
      */
     private $isEmptyState = false;
 
+    /**
+     * The finder plugins status
+     *
+     * @var    boolean
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected $finderPlugins = true;
+
     /**
      * Method to display the view.
      *
@@ -157,6 +166,11 @@ public function display($tpl = null)
             $this->finderPluginId = FinderHelper::getFinderPluginId();
         }
 
+        // Check that the finder plugins are enabled
+        if (!PluginHelper::getPlugin('finder')) {
+            $this->finderPlugins = false;
+        }
+
         // Configure the toolbar.
         $this->addToolbar();
 

administrator/components/com_finder/tmpl/index/default.php

@@ -52,6 +52,13 @@
     Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
 }
 
+// Show warning that the finder plugins are disabled
+if (!$this->finderPlugins) {
+    $url  = 'index.php?option=com_plugins&filter[folder]=finder';
+    $link = HTMLHelper::_('link', Route::_($url), Text::_('COM_FINDER_FINDER_PLUGINS'), 'class="alert-link"');
+    Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_FINDER_NOT_ENABLED_LINK', $link), 'warning');
+}
+
 ?>
 <form action="<?php echo Route::_('index.php?option=com_finder&view=index'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row">

administrator/components/com_finder/tmpl/index/emptystate.php

@@ -55,3 +55,10 @@
     );
     Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning');
 }
+
+// Show warning that the finder plugins are disabled
+if (!$this->finderPlugins) {
+    $url  = 'index.php?option=com_plugins&filter[folder]=finder';
+    $link = HTMLHelper::_('link', Route::_($url), Text::_('COM_FINDER_FINDER_PLUGINS'), 'class="alert-link"');
+    Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_FINDER_NOT_ENABLED_LINK', $link), 'warning');
+}

administrator/components/com_scheduler/forms/filter_logs.xml

@@ -61,4 +61,4 @@
 			class="js-select-submit-on-change"
 		/>
 	</fields>
-</form>
+</form>

administrator/components/com_scheduler/src/Controller/LogsController.php

@@ -10,10 +10,8 @@
 
 namespace Joomla\Component\Scheduler\Administrator\Controller;
 
-use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
-use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -46,7 +44,7 @@ class LogsController extends AdminController
      *
      * @since   5.3.0
      */
-    public function getModel($name = 'Logs', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    public function getModel($name = 'Log', $prefix = 'Administrator', $config = ['ignore_request' => true])
     {
         return parent::getModel($name, $prefix, $config);
     }
@@ -73,39 +71,4 @@ public function purge()
 
         $this->setRedirect('index.php?option=com_scheduler&view=logs', $message);
     }
-
-    /**
-     * Removes an item.
-     *
-     * Overrides Joomla\CMS\MVC\Controller\FormController::delete to check the core.admin permission.
-     *
-     * @return  void
-     *
-     * @since   5.3.0
-     */
-    public function delete(): void
-    {
-        $ids = $this->input->get('cid', [], 'array');
-
-        if (!$this->app->getIdentity()->authorise('core.admin', $this->option)) {
-            throw new NotAllowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
-        }
-
-        if (empty($ids)) {
-            $this->setMessage(Text::_('COM_SCHEDULER_NO_LOGS_SELECTED'), 'warning');
-            $this->setRedirect('index.php?option=com_scheduler&view=logs');
-            return;
-        }
-
-        // Get the model.
-        $model = $this->getModel();
-        $ids   = ArrayHelper::toInteger($ids);
-
-        // Remove the items.
-        if ($model->delete($ids)) {
-            $this->setMessage(Text::plural('COM_SCHEDULER_N_ITEMS_DELETED', \count($ids)));
-        }
-
-        $this->setRedirect('index.php?option=com_scheduler&view=logs');
-    }
 }

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

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_scheduler
+ *
+ * @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\Scheduler\Administrator\Model;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Table\Table;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * MVC Model to interact with the Scheduler logs.
+ *
+ * @since  __DPELOY_VERSION__
+ */
+class LogModel extends AdminModel
+{
+    /**
+     * There is no form for the log.
+     *
+     * @param   array  $data      Data that needs to go into the form
+     * @param   bool   $loadData  Should the form load its data from the DB?
+     *
+     * @return Form|boolean  A Form object on success, false on failure.
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    public function getForm($data = [], $loadData = true)
+    {
+        return false;
+    }
+
+    /**
+     * Method to get a table object, load it if necessary.
+     *
+     * @param   string  $name     The table name. Optional.
+     * @param   string  $prefix   The class prefix. Optional.
+     * @param   array   $options  Configuration array for model. Optional.
+     *
+     * @return Table
+     *
+     * @since  __DEPLOY_VERSION__
+     * @throws \Exception
+     */
+    public function getTable($name = 'Log', $prefix = 'Administrator', $options = []): Table
+    {
+        return parent::getTable($name, $prefix, $options);
+    }
+}

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

@@ -15,7 +15,6 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Component\Scheduler\Administrator\Helper\SchedulerHelper;
@@ -185,91 +184,4 @@ protected function getListQuery()
 
         return $query;
     }
-
-    /**
-     * Delete rows.
-     *
-     * @param   array    $pks    The ids of the items to delete.
-     *
-     * @return  boolean  Returns true on success, false on failure.
-     */
-    public function delete($pks)
-    {
-        if ($this->canDelete($pks)) {
-            // Delete logs from list
-            $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
-                ->delete($db->quoteName('#__scheduler_logs'))
-                ->whereIn($db->quoteName('id'), $pks);
-
-            $db->setQuery($query);
-            $this->setError((string) $query);
-
-            try {
-                $db->execute();
-            } catch (\RuntimeException $e) {
-                $this->setError($e->getMessage());
-
-                return false;
-            }
-        } else {
-            Factory::getApplication()->enqueueMessage(Text::_('JERROR_CORE_DELETE_NOT_PERMITTED'), 'error');
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine whether a record may be deleted taking into consideration
-     * the user's permissions over the record.
-     *
-     * @param   object  $record  The database row/record in question
-     *
-     * @return  boolean  True if the record may be deleted
-     *
-     * @since  5.3.0
-     * @throws \Exception
-     */
-    protected function canDelete($record): bool
-    {
-        // Record doesn't exist, can't delete
-        if (empty($record)) {
-            return false;
-        }
-
-        return Factory::getApplication()->getIdentity()->authorise('core.delete', 'com_scheduler');
-    }
-
-    /**
-     * @param   array   $data        The task execution data.
-     *
-     * @return void
-     *
-     * @since 5.3.0
-     * @throws Exception
-     */
-    public function logTask(array $data): void
-    {
-        $model         = Factory::getApplication()->bootComponent('com_scheduler')
-            ->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-        $taskInfo      = $model->getItem($data['TASK_ID']);
-        $taskOptions   = SchedulerHelper::getTaskOptions();
-        $safeTypeTitle = $taskOptions->findOption($taskInfo->type)->title ?? '';
-        $duration      = ($data['TASK_DURATION'] ?? 0);
-        $created       = Factory::getDate()->toSql();
-
-        /** @var \Joomla\Component\Schduler\Administrator\Table\LogsTable $table */
-        $logsTable           = $this->getTable();
-        $logsTable->tasktype = $safeTypeTitle;
-        $logsTable->taskname = $data['TASK_TITLE'];
-        $logsTable->duration = $duration;
-        $logsTable->jobid    = $data['TASK_ID'];
-        $logsTable->exitcode = $data['EXIT_CODE'];
-        $logsTable->taskid   = $data['TASK_TIMES'];
-        $logsTable->lastdate = $created;
-        $logsTable->nextdate = $taskInfo->next_execution;
-
-        // Log the execution of the task.
-        $logsTable->store();
-    }
 }