Merge branch '5.1-dev' into popup-plugin-edit

.drone.yml

@@ -6,15 +6,15 @@ clone:
 
 steps:
   - name: setup
-    image: joomlaprojects/docker-images:php8.2
+    image: joomlaprojects/docker-images:php8.3
     volumes:
       - name: certificates
         path: /certificates
     commands:
       - cp -v tests/certs/* /certificates/
 
   - name: composer
-    image: joomlaprojects/docker-images:php8.2
+    image: joomlaprojects/docker-images:php8.3
     volumes:
       - name: composer-cache
         path: /tmp/composer-cache
@@ -63,6 +63,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Unit
 
+  - name: php83-unit
+    depends_on: [ phpcs ]
+    image: joomlaprojects/docker-images:php8.3
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Unit
+
   - name: php81-integration
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
@@ -77,6 +84,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration
 
+  - name: php83-integration
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.3
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration
+
   - name: php81-integration-pgsql
     depends_on: [ npm ]
     image: joomlaprojects/docker-images:php8.1
@@ -91,6 +105,13 @@ steps:
       - php -v
       - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
 
+  - name: php83-integration-pgsql
+    depends_on: [ npm ]
+    image: joomlaprojects/docker-images:php8.3
+    commands:
+      - php -v
+      - ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist
+
   - name: scss-cs
     depends_on: [ npm ]
     image: node:current-alpine
@@ -145,7 +166,7 @@ steps:
   - name: phpnext-system-mysql
     depends_on:
       - phpmax-system-mysql
-    image: joomlaprojects/docker-images:cypress8.2
+    image: joomlaprojects/docker-images:cypress8.3
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -184,7 +205,7 @@ steps:
   - name: phpnext-system-postgres
     depends_on:
       - phpmax-system-postgres
-    image: joomlaprojects/docker-images:cypress8.2
+    image: joomlaprojects/docker-images:cypress8.3
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -382,6 +403,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 5814cadc441b90eec51da0aa32cd29ff1014c4d759841cc70063b5e9245d2b08
+hmac: e8ab45eb1d91c0b0b38c8d25a3a983d112c973dcba0153a982f2afd581dfa458
 
 ...

administrator/components/com_actionlogs/src/Field/UserlogtypeField.php

@@ -22,15 +22,15 @@
 /**
  * Field to load a list of all users that have logged actions
  *
- * @since  __DEPLOY_VERSION__
+ * @since  5.1.0
  */
 class UserlogtypeField extends ListField
 {
     /**
      * The form field type.
      *
      * @var    string
-     * @since  __DEPLOY_VERSION__
+     * @since  5.1.0
      */
     protected $type = 'UserLogType';
 
@@ -39,7 +39,7 @@ class UserlogtypeField extends ListField
      *
      * @return  array  The field option objects.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.1.0
      */
     public function getOptions()
     {

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

@@ -198,6 +198,12 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
             $messageData['type'] = Text::_($messageData['type']);
         }
 
+        // Remove links from the message template, if we should not generate links.
+        if (!$generateLinks) {
+            $message = preg_replace('/<a href=["\'].+?["\']>/', '', $message);
+            $message = str_replace('</a>', '', $message);
+        }
+
         $linkMode = Factory::getApplication()->get('force_ssl', 0) >= 1 ? Route::TLS_FORCE : Route::TLS_IGNORE;
 
         foreach ($messageData as $key => $value) {
@@ -324,6 +330,12 @@ public static function loadActionLogPluginsLanguage()
         // Load plg_system_actionlogs too
         $lang->load('plg_system_actionlogs', JPATH_ADMINISTRATOR);
 
+        // Load plg_system_privacyconsent too
+        $lang->load('plg_system_privacyconsent', JPATH_ADMINISTRATOR);
+
+        // Load plg_user_terms too
+        $lang->load('plg_user_terms', JPATH_ADMINISTRATOR);
+
         // Load com_privacy too.
         $lang->load('com_privacy', JPATH_ADMINISTRATOR);
     }

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

@@ -151,6 +151,7 @@ protected function sendNotificationEmails($messages, $username, $context)
         $lang->load('com_actionlogs', JPATH_ADMINISTRATOR);
         ActionlogsHelper::loadTranslationFiles($extension);
         $temp      = [];
+        $tempPlain = [];
 
         foreach ($messages as $message) {
             $m              = [];
@@ -159,14 +160,23 @@ protected function sendNotificationEmails($messages, $username, $context)
             $m['date']      = HTMLHelper::_('date', $message->log_date, 'Y-m-d H:i:s T', 'UTC');
             $m['username']  = $username;
             $temp[]         = $m;
+
+            // copy replacement tags array and set non-HTML message.
+            $mPlain            = array_merge([], $m);
+            $mPlain['message'] = ActionlogsHelper::getHumanReadableLogMessage($message, false);
+            $tempPlain[]       = $mPlain;
         }
 
         $templateData = [
             'messages' => $temp,
         ];
+        $templateDataPlain = [
+            'messages' => $tempPlain,
+        ];
 
         $mailer = new MailTemplate('com_actionlogs.notification', $app->getLanguage()->getTag());
         $mailer->addTemplateData($templateData);
+        $mailer->addTemplateData($templateDataPlain, true);
 
         foreach ($recipients as $recipient) {
             $mailer->addRecipient($recipient);

administrator/components/com_admin/sql/updates/mysql/5.1.0-2023-11-28.sql

@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
+(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 0, 0);

administrator/components/com_admin/sql/updates/postgresql/5.1.0-2023-11-28.sql

@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
+(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 0, '', '{}', '', 0, 0);

administrator/components/com_categories/src/Field/Modal/CategoryField.php

@@ -64,6 +64,12 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             return $result;
         }
 
+        if ($this->element['extension']) {
+            $extension = (string) $this->element['extension'];
+        } else {
+            $extension = (string) Factory::getApplication()->getInput()->get('extension', 'com_content');
+        }
+
         Factory::getApplication()->getLanguage()->load('com_categories', JPATH_ADMINISTRATOR);
 
         $languages = LanguageHelper::getContentLanguages([0, 1], false);
@@ -79,6 +85,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             'view'                  => 'categories',
             'layout'                => 'modal',
             'tmpl'                  => 'component',
+            'extension'             => $extension,
             Session::getFormToken() => 1,
         ]);
         $linkItem = clone $linkItems;

administrator/components/com_contenthistory/tmpl/history/modal.php

@@ -100,7 +100,7 @@
                             <?php endif; ?>
                         </td>
                         <td class="d-none d-md-table-cell">
-                            <?php echo htmlspecialchars($item->editor); ?>
+                            <?php echo empty($item->editor) ? $item->editor_user_id : htmlspecialchars($item->editor); ?>
                         </td>
                         <td class="text-end">
                             <?php echo number_format((int) $item->character_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?>

administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php

@@ -119,6 +119,15 @@ class HtmlView extends BaseHtmlView
      */
     protected $reasonNoDownload = '';
 
+    /**
+     * Details on failed PHP or DB version requirements to be shown in the emptystate layout when there is no download
+     *
+     * @var \stdClass  PHP and database requirements from the update manifest
+     *
+     * @since 4.4.2
+     */
+    protected $detailsNoDownload;
+
     /**
      * List of non core critical plugins
      *
@@ -199,8 +208,9 @@ public function display($tpl = null)
             } else {
                 // No download available
                 if ($hasUpdate) {
-                    $this->messagePrefix    = '_NODOWNLOAD';
-                    $this->reasonNoDownload = 'COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON';
+                    $this->messagePrefix     = '_NODOWNLOAD';
+                    $this->reasonNoDownload  = 'COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON';
+                    $this->detailsNoDownload = $this->updateInfo['object']->get('otherUpdateInfo');
                 }
 
                 $this->setLayout('noupdate');

administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php

@@ -15,11 +15,35 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Session\Session;
 
-$uploadLink = 'index.php?option=com_joomlaupdate&view=upload';
+$uploadLink       = 'index.php?option=com_joomlaupdate&view=upload';
+$reasonNoDownload = '';
+
+if (!empty($this->reasonNoDownload)) {
+    $reasonNoDownload = Text::_($this->reasonNoDownload) . '<br>';
+
+    if (isset($this->detailsNoDownload->php)) {
+        $reasonNoDownload .= Text::sprintf(
+            'COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_PHP',
+            $this->detailsNoDownload->php->used,
+            $this->detailsNoDownload->php->required
+        ) . '<br>';
+    }
+
+    if (isset($this->detailsNoDownload->db)) {
+        $reasonNoDownload .= Text::sprintf(
+            'COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_DATABASE',
+            Text::_('JLIB_DB_SERVER_TYPE_' . $this->detailsNoDownload->db->type),
+            $this->detailsNoDownload->db->used,
+            $this->detailsNoDownload->db->required
+        ) . '<br>';
+    }
+
+    $reasonNoDownload .= Text::_('COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION') . '<br>';
+}
 
 $displayData = [
     'textPrefix' => 'COM_JOOMLAUPDATE' . $this->messagePrefix,
-    'content'    => Text::_($this->reasonNoDownload) . Text::sprintf($this->langKey, $this->updateSourceKey),
+    'content'    => $reasonNoDownload . Text::sprintf($this->langKey, $this->updateSourceKey),
     'formURL'    => 'index.php?option=com_joomlaupdate&view=joomlaupdate',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version',
     'icon'       => 'icon-loop joomlaupdate',

administrator/components/com_media/resources/scripts/components/browser/items/document.vue

@@ -7,7 +7,7 @@
     <div class="media-browser-item-preview">
       <div class="file-background">
         <div class="file-icon">
-          <span class="fas fa-file-pdf" />
+          <span class="fas fa-file" />
         </div>
       </div>
     </div>

administrator/components/com_menus/tmpl/items/modal.php

@@ -33,14 +33,14 @@
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$link      = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . Session::getFormToken() . '=1';
+$link      = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . Session::getFormToken() . '=1&function=' . $function;
 $multilang = Multilanguage::isEnabled();
 
 if (!empty($editor)) {
     // This view is used also in com_menus. Load the xtd script only if the editor is set!
     $this->document->addScriptOptions('xtd-menus', ['editor' => $editor]);
     $onclick = "jSelectMenuItem";
-    $link    = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . Session::getFormToken() . '=1';
+    $link    = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . Session::getFormToken() . '=1&function=' . $function;
 }
 ?>
 <div class="container-popup">
@@ -186,7 +186,6 @@
 
         <input type="hidden" name="task" value="">
         <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="function" value="<?php echo $function; ?>">
         <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
         <?php echo HTMLHelper::_('form.token'); ?>
 

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

@@ -886,8 +886,8 @@ public function &getSource()
             $fileName = str_replace('//', '/', $fileName);
             $isMedia  = $input->getInt('isMedia', 0);
 
-            $fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
-            : Path::clean(JPATH_ROOT . ($this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);
+            $fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
+            : Path::clean(JPATH_ROOT . ((int) $this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);
 
             try {
                 $filePath = Path::check($fileName);

administrator/components/com_templates/tmpl/template/default.php

@@ -60,7 +60,7 @@
     <div class="row mt-2">
         <div class="col-md-8" id="conditional-section">
             <?php if ($this->type != 'home') : ?>
-                <p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
+                <p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ((int) $this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
                 <p class="lead path hidden"><?php echo $this->source->filename; ?></p>
             <?php endif; ?>
         </div>
@@ -80,7 +80,7 @@
                     <li class="folder-select">
                         <a class="folder-url" data-id="" href="">
                             <span class="icon-folder icon-fw" aria-hidden="true"></span>
-                            <?php echo ($this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
+                            <?php echo ((int) $this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
                         </a>
                         <?php echo $this->loadTemplate('tree'); ?>
                     </li>
@@ -90,7 +90,7 @@
                         <li class="folder-select">
                             <a class="folder-url" data-id="" href="">
                                 <span class="icon-folder icon-fw" aria-hidden="true"></span>
-                                <?php echo '/media/templates/' . ($this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
+                                <?php echo '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
                             </a>
                             <?php echo $this->loadTemplate('tree_media'); ?>
                         </li>

administrator/components/com_users/tmpl/users/default.php

@@ -146,14 +146,17 @@
                                     <?php endif; ?>
                                 </td>
                                 <td class="text-center d-md-table-cell">
-                                    <?php
-                                    $activated = empty($item->activation) ? 0 : 1;
-                                    echo HTMLHelper::_('jgrid.state', HTMLHelper::_('users.activateStates'), $activated, $i, 'users.', (bool) $activated);
-                                    ?>
+                                    <?php if (empty($item->activation)) : ?>
+                                        <span class="icon-check" aria-hidden="true" aria-describedby="tip-activated<?php echo $i; ?>"></span>
+                                        <div role="tooltip" id="tip-activated<?php echo $i; ?>">
+                                            <?php echo Text::_('COM_USERS_ACTIVATED'); ?>
+                                        </div>
+                                    <?php else : ?>
+                                        <?php echo HTMLHelper::_('jgrid.state', HTMLHelper::_('users.activateStates'), 1, $i, 'users.', true); ?>
+                                    <?php endif; ?>
                                 </td>
                                 <?php if ($mfa) : ?>
                                 <td class="text-center d-none d-md-table-cell">
-                                    <span class="tbody-icon">
                                     <?php if ($item->mfaRecords > 0 || !empty($item->otpKey)) : ?>
                                         <span class="icon-check" aria-hidden="true" aria-describedby="tip-mfa<?php echo $i; ?>"></span>
                                         <div role="tooltip" id="tip-mfa<?php echo $i; ?>">
@@ -165,7 +168,6 @@
                                             <?php echo Text::_('COM_USERS_MFA_NOTACTIVE'); ?>
                                         </div>
                                     <?php endif; ?>
-                                    </span>
                                 </td>
                                 <?php endif; ?>
                                 <td class="d-none d-md-table-cell">

administrator/language/en-GB/com_fields.ini

@@ -21,6 +21,8 @@ COM_FIELDS_FIELD_EDITABLE_IN_BOTH="Both"
 COM_FIELDS_FIELD_EDITABLE_IN_LABEL="Editable In"
 COM_FIELDS_FIELD_EDITABLE_IN_SITE="Site"
 COM_FIELDS_FIELD_FORM_EDIT="Edit Field"
+; The following string is deprecated and will be removed with 6.0
+COM_FIELDS_FIELD_FORM_LAYOUT_LABEL="Layout"
 COM_FIELDS_FIELD_FORM_NEW="New Field"
 COM_FIELDS_FIELD_FORMOPTIONS_HEADING="Form Options"
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"

administrator/language/en-GB/com_joomlaupdate.ini

@@ -44,7 +44,10 @@ COM_JOOMLAUPDATE_MINIMUM_STABILITY_STABLE="Stable"
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_APPEND="Upload and Update"
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_BUTTON_ADD="Retry check for update"
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_CONTENT="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. Either the update to Joomla %1$s is not available for your stability level or there is a problem with the Joomla Update Server.<br>Please try to download the update package from <a href=\"https://downloads.joomla.org/latest\">the official Joomla download page</a> and use the Upload and Update function."
-COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON="An update to Joomla %1$s was found but your web server doesn't meet the <a href=\"https://downloads.joomla.org/technical-requirements\" target=\"_blank\" rel=\"noopener noreferrer\">minimum requirements</a>. Please contact your web host to update your server.<br>"
+COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON="An update to Joomla %1$s was found but your web server doesn't meet the <a href=\"https://manual.joomla.org/docs/next/get-started/technical-requirements/\" target=\"_blank\" rel=\"noopener noreferrer\">minimum requirements</a>."
+COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_ACTION="Please contact your web host to update your server."
+COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_DATABASE="Your %1$s version \"%2$s\" is lower than \"%3$s\"."
+COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_REASON_PHP="Your PHP version \"%1$s\" is lower than \"%2$s\"."
 COM_JOOMLAUPDATE_NODOWNLOAD_EMPTYSTATE_TITLE="This site can't be updated to Joomla %1$s"
 COM_JOOMLAUPDATE_OVERVIEW="Joomla Update"
 COM_JOOMLAUPDATE_PREUPDATE_CHECK_CAPTION="Server settings to check before update."