Merge remote-tracking branch 'Joomla/5.3-dev' into 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_admin/sql/updates/mysql/5.3.0-2024-12-09.sql

@@ -0,0 +1,2 @@
+INSERT INTO `#__action_log_config` (`type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
+('contact', 'com_contact.form', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA');

administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__action_logs_users` ADD COLUMN `exclude_self` tinyint NOT NULL DEFAULT 0;

administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-09.sql

@@ -0,0 +1,2 @@
+INSERT INTO "#__action_log_config" ("type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
+('contact', 'com_contact.form', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA');

administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql

@@ -0,0 +1 @@
+ALTER TABLE "#__action_logs_users" ADD COLUMN "exclude_self" integer DEFAULT 0 NOT NULL;

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');
+}