[5.0] Upmerge

administrator/components/com_categories/src/Dispatcher/Dispatcher.php

@@ -31,7 +31,9 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess()
     {
-        $extension = $this->getApplication()->getInput()->getCmd('extension');
+        $extension = empty($this->getApplication()->getInput()->getCmd('extension'))
+                    ? ''
+                    : $this->getApplication()->getInput()->getCmd('extension');
 
         $parts = explode('.', $extension);
 

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

@@ -1216,7 +1216,8 @@ public function sendTestMail()
         $mailer = new MailTemplate('com_config.test_mail', $user->getParam('language', $app->get('language')), $mail);
         $mailer->addTemplateData(
             [
-                'sitename' => $app->get('sitename'),
+                // Replace the occurrences of "@" and "|" in the site name
+                'sitename' => str_replace(['@', '|'], '', $app->get('sitename')),
                 'method'   => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)),
             ]
         );

administrator/components/com_finder/src/Indexer/Adapter.php

@@ -651,7 +651,7 @@ protected function getListQuery($query = null)
      *
      * @param   integer  $id  The plugin ID
      *
-     * @return  string  The plugin type
+     * @return  string|null  The plugin type
      *
      * @since   2.5
      */
@@ -661,6 +661,7 @@ protected function getPluginType($id)
         $query = $this->db->getQuery(true)
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
+            ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('finder'))
             ->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
         $this->db->setQuery($query);
 
@@ -895,6 +896,8 @@ protected function pluginDisable($pks)
                 foreach ($items as $item) {
                     $this->remove($item);
                 }
+                // Stop processing plugins
+                break;
             }
         }
     }

administrator/components/com_finder/src/Indexer/Language.php

@@ -137,7 +137,7 @@ public function tokenise($input)
          *
          * Regexes:
          *  1. Remove everything except letters, numbers, quotes, apostrophe, plus, dash, period, and comma.
-         *  2. Remove plus, dash, period, and comma characters located before letter characters.
+         *  2. Remove plus, dash, and comma characters located before letter characters.
          *  3. Remove plus, dash, period, and comma characters located after other characters.
          *  4. Remove plus, period, and comma characters enclosed in alphabetical characters. Ungreedy.
          *  5. Remove orphaned apostrophe, plus, dash, period, and comma characters.
@@ -147,7 +147,7 @@ public function tokenise($input)
          */
         $input = StringHelper::strtolower($input);
         $input = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,]+#mui', ' ', $input);
-        $input = preg_replace('#(^|\s)[+-.,]+([\pL\pM]+)#mui', ' $1', $input);
+        $input = preg_replace('#(^|\s)[+-,]+([\pL\pM]+)#mui', ' $1', $input);
         $input = preg_replace('#([\pL\pM\pN]+)[+-.,]+(\s|$)#mui', '$1 ', $input);
         $input = preg_replace('#([\pL\pM]+)[+.,]+([\pL\pM]+)#muiU', '$1 $2', $input);
         $input = preg_replace('#(^|\s)[\'+-.,]+(\s|$)#mui', ' ', $input);

administrator/components/com_finder/src/Service/HTML/Filter.php

@@ -17,6 +17,7 @@
 use Joomla\Component\Finder\Administrator\Helper\LanguageHelper;
 use Joomla\Component\Finder\Administrator\Indexer\Query;
 use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\ParameterType;
 use Joomla\Filter\OutputFilter;
 use Joomla\Registry\Registry;
 
@@ -292,19 +293,27 @@ public function select($idxQuery, $options)
                 $query->clear()
                     ->select('t.*')
                     ->from($db->quoteName('#__finder_taxonomy') . ' AS t')
-                    ->where('t.lft > ' . (int) $bv->lft)
-                    ->where('t.rgt < ' . (int) $bv->rgt)
+                    ->where('t.lft > :lft')
+                    ->where('t.rgt < :rgt')
                     ->where('t.state = 1')
-                    ->where('t.access IN (' . $groups . ')')
-                    ->order('t.title');
+                    ->whereIn('t.access', $user->getAuthorisedViewLevels())
+                    ->order('t.title')
+                    ->bind(':lft', $bv->lft, ParameterType::INTEGER)
+                    ->bind(':rgt', $bv->rgt, ParameterType::INTEGER);
+
+                // Apply multilanguage filter
+                if (Multilanguage::isEnabled()) {
+                    $language = [Factory::getLanguage()->getTag(), '*'];
+                    $query->whereIn($db->quoteName('t.language'), $language, ParameterType::STRING);
+                }
 
                 // Self-join to get the parent title.
                 $query->select('e.title AS parent_title')
                     ->join('LEFT', $db->quoteName('#__finder_taxonomy', 'e') . ' ON ' . $db->quoteName('e.id') . ' = ' . $db->quoteName('t.parent_id'));
 
                 // Limit the nodes to a predefined filter.
                 if (!empty($filter->data)) {
-                    $query->where('t.id IN(' . $filter->data . ')');
+                    $query->whereIn('t.id', explode(",", $filter->data));
                 }
 
                 // Load the branches.

administrator/components/com_templates/src/Controller/TemplateController.php

@@ -479,7 +479,7 @@ public function createFile()
             $this->setMessage(Text::_('COM_TEMPLATES_INVALID_FILE_TYPE'), 'error');
             $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file . '&isMedia=' . $this->input->getInt('isMedia', 0);
             $this->setRedirect(Route::_($url, false));
-        } elseif (!preg_match('/^(?!\.)(?!.*\.$)(?!.*\.\.)[a-zA-Z0-9_.]+$/', $name)) {
+        } elseif (!preg_match('/^(?!\.)(?!.*\.$)(?!.*\.\.)[a-zA-Z0-9_.-]+$/', $name)) {
             $this->setMessage(Text::_('COM_TEMPLATES_INVALID_FILE_NAME'), 'error');
             $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file . '&isMedia=' . $this->input->getInt('isMedia', 0);
             $this->setRedirect(Route::_($url, false));
@@ -672,7 +672,7 @@ public function renameFile()
             $this->setMessage(Text::_('COM_TEMPLATES_ERROR_RENAME_ASSET_FILE'), 'warning');
             $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file . '&isMedia=' . $isMedia;
             $this->setRedirect(Route::_($url, false));
-        } elseif (!preg_match('/^(?!\.)(?!.*\.$)(?!.*\.\.)[a-zA-Z0-9_.]+$/', $newName)) {
+        } elseif (!preg_match('/^(?!\.)(?!.*\.$)(?!.*\.\.)[a-zA-Z0-9_.-]+$/', $newName)) {
             $this->setMessage(Text::_('COM_TEMPLATES_INVALID_FILE_NAME'), 'error');
             $url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file . '&isMedia=' . $isMedia;
             $this->setRedirect(Route::_($url, false));

administrator/components/com_templates/src/Model/StyleModel.php

@@ -395,9 +395,12 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
         $formFile = Path::clean($client->path . '/templates/' . $template . '/templateDetails.xml');
 
         // Load the core and/or local language file(s).
+        // Default to using parent template language constants
+        $lang->load('tpl_' . $data->parent, $client->path)
+            || $lang->load('tpl_' . $data->parent, $client->path . '/templates/' . $data->parent);
+
+        // Apply any, optional, overrides for child template language constants
         $lang->load('tpl_' . $template, $client->path)
-            || (!empty($data->parent) && $lang->load('tpl_' . $data->parent, $client->path))
-            || (!empty($data->parent) && $lang->load('tpl_' . $data->parent, $client->path . '/templates/' . $data->parent))
             || $lang->load('tpl_' . $template, $client->path . '/templates/' . $template);
 
         if (file_exists($formFile)) {

build/media_source/com_joomlaupdate/js/default.es6.js

@@ -541,6 +541,7 @@ Joomla = window.Joomla || {};
           const pluginTitleTableCell = tableRow.querySelector('.exname');
           pluginTitleTableCell.innerHTML = `${Joomla.sanitizeHtml(pluginTitleTableCell.innerHTML)}
               <div class="small">
+              ${document.querySelector(`td[data-extension-id="${plugin.extension_id}"]`) ? '' : ` - ${plugin.name}`}
               <span class="badge bg-warning">
               <span class="icon-warning"></span>
               ${Joomla.Text._('COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN')}
@@ -569,10 +570,15 @@ Joomla = window.Joomla || {};
         status = 'warning';
       }
 
-      if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && status === 'success') {
+      if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && status === 'success' && document.getElementById('preupdatecheckbox')) {
         document.getElementById('preupdatecheckbox').style.display = 'none';
+      }
+
+      if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && status === 'success' && document.getElementById('noncoreplugins')) {
         document.getElementById('noncoreplugins').checked = true;
+      }
 
+      if (PreUpdateChecker.nonCoreCriticalPlugins.length === 0 && status === 'success') {
         [].slice.call(document.querySelectorAll('button.submitupdate')).forEach((el) => {
           el.classList.remove('disabled');
           el.removeAttribute('disabled');

build/media_source/system/js/fields/calendar.es5.js

@@ -296,7 +296,9 @@
 
 		if (window.innerHeight < containerTmp.getBoundingClientRect().bottom + 20) {
 			containerTmp.style.marginTop = - (containerTmp.getBoundingClientRect().height + this.inputField.getBoundingClientRect().height) + "px";
-		}
+		} else {
+      containerTmp.style.marginTop = 'initial';
+    }
 
 		this.processCalendar();
 	};

build/media_source/system/js/fields/joomla-field-media.w-c.es6.js

@@ -302,7 +302,7 @@ class JoomlaFieldMedia extends HTMLElement {
         let type;
         this.buttonClearEl.style.display = '';
         this.previewElement.innerHTML = '';
-        const ext = getExtension(value);
+        const ext = getExtension(value).toLowerCase();
 
         if (supportedExtensions.images.includes(ext)) type = 'images';
         if (supportedExtensions.audios.includes(ext)) type = 'audios';

build/media_source/system/js/fields/modal-fields.es5.js

@@ -150,8 +150,11 @@
 				iframeDocument = this.contentDocument;
 
 				// Validate the child form and update parent form.
-				if (iframeDocument.getElementById(idFieldId) && iframeDocument.getElementById(idFieldId).value != '0')
-				{
+				if (
+					iframeDocument.getElementById(idFieldId)
+					&& iframeDocument.getElementById(idFieldId).value != '0'
+					&& [].slice.call(iframeDocument.querySelectorAll('joomla-alert[type="danger"]')).length == 0
+				) {
 					window.processModalParent(fieldPrefix, iframeDocument.getElementById(idFieldId).value, iframeDocument.getElementById(titleFieldId).value);
 
 					// If Save & Close (save task), submit the edit close action (so we don't have checked out items).

build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss

@@ -22,6 +22,7 @@
     flex-direction: column;
     justify-content: center;
     padding: .8rem;
+    line-height: normal;
     color: var(--white);
     background: var(--alert-accent-color, var(--template-bg-dark));
     align-content: center;

components/com_contact/src/Controller/ContactController.php

@@ -180,12 +180,23 @@ public function submit()
             'data'    => $eventData,
         ]))->getArgument('result', []);
 
+        $passValidation = true;
+
         foreach ($results as $result) {
             if ($result instanceof \Exception) {
-                return false;
+                $passValidation = false;
+                $app->enqueueMessage($result->getMessage(), 'error');
             }
         }
 
+        if (!$passValidation) {
+            $app->setUserState('com_contact.contact.data', $data);
+
+            $this->setRedirect(Route::_('index.php?option=com_contact&view=contact&id=' . $id . '&catid=' . $contact->catid, false));
+
+            return false;
+        }
+
         // Passed Validation: Process the contact plugins to integrate with other applications
         $this->getDispatcher()->dispatch('onSubmitContact', new SubmitContactEvent('onSubmitContact', [
             'subject' => $contact,

components/com_tags/src/Controller/TagsController.php

@@ -35,8 +35,8 @@ public function searchAjax()
 
         // Receive request data
         $filters = [
-            'like'      => trim($this->input->get('like', null, 'string')),
-            'title'     => trim($this->input->get('title', null, 'string')),
+            'like'      => trim($this->input->get('like', '', 'string')),
+            'title'     => trim($this->input->get('title', '', 'string')),
             'flanguage' => $this->input->get('flanguage', null, 'word'),
             'published' => $this->input->get('published', 1, 'int'),
             'parent_id' => $this->input->get('parent_id', 0, 'int'),

composer.json

@@ -73,13 +73,13 @@
         "google/recaptcha": "^1.3.0",
         "laminas/laminas-diactoros": "^2.25.2",
         "paragonie/sodium_compat": "^1.20",
-        "phpmailer/phpmailer": "^6.8.0",
+        "phpmailer/phpmailer": "^6.8.1",
         "psr/link": "~1.1.1",
-        "symfony/console": "^6.3.2",
+        "symfony/console": "^6.3.4",
         "symfony/error-handler": "^6.3.2",
         "symfony/ldap": "^6.3.0",
         "symfony/options-resolver": "^6.3.0",
-        "symfony/polyfill-mbstring": "^1.27.0",
+        "symfony/polyfill-mbstring": "^1.28.0",
         "symfony/web-link": "^6.3.0",
         "symfony/yaml": "^6.3.3",
         "typo3/phar-stream-wrapper": "^3.1.7",
@@ -93,11 +93,11 @@
         "ext-gd": "*",
         "web-auth/webauthn-lib": "4.3.0",
         "ext-dom": "*",
-        "composer/ca-bundle": "^1.3.6",
+        "composer/ca-bundle": "^1.3.7",
         "dragonmantank/cron-expression": "^3.3.3",
         "enshrined/svg-sanitize": "^0.15.4",
         "lcobucci/jwt": "^4.3.0",
-        "web-token/signature-pack": "^3.2.7",
+        "web-token/signature-pack": "^3.2.8",
         "phpseclib/bcmath_compat": "^2.0.1",
         "jfcherng/php-diff": "^6.15.3",
         "voku/portable-utf8": "^6.0.13"