Merge branch '5.1-dev' into 5.1/modules/site/banners

.appveyor.yml

@@ -48,16 +48,16 @@ hosts:
   openldap: 127.0.0.1
 
 services:
-  - mysql
   - iis
 
 before_test:
 #  Run openldap docker image
   - ps: docker pull bitnami/openldap:2.6.3
   - ps: docker run --rm --name openldap --publish 1389:1389 --publish 1636:1636 -v ${pwd}\tests\certs:/certificates --env LDAP_ADMIN_USERNAME=admin --env LDAP_ADMIN_PASSWORD=adminpassword --env LDAP_USERS=customuser --env LDAP_PASSWORDS=custompassword --env LDAP_ENABLE_TLS=yes --env LDAP_TLS_CERT_FILE=/certificates/openldap.crt --env LDAP_TLS_KEY_FILE=/certificates/openldap.key --env LDAP_TLS_CA_FILE=/certificates/CA.crt --env BITNAMI_DEBUG=true --env LDAP_CONFIG_ADMIN_ENABLED=yes --env LDAP_CONFIG_ADMIN_USERNAME=admin --env LDAP_CONFIG_ADMIN_PASSWORD=configpassword -d bitnami/openldap:2.6.3
 #  Database setup for MySQL via PowerShell tools
+  - ps: Start-Service MySQL80
   - >
-    "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"
+    "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"
 # Wait till slapd has started
   - ps: |
       $Counter=0

.drone.yml

@@ -286,29 +286,39 @@ steps:
   - name: packager
     image: joomlaprojects/docker-images:packager
     environment:
-      FTP_USERNAME:
-        from_secret: ftpusername
-      FTP_PASSWORD:
-        from_secret: ftppassword
-      FTP_HOSTNAME: ci.joomla.org
-      FTP_PORT: "21"
-      FTP_DEST_DIR: /artifacts
-      FTP_VERIFY: "false"
-      FTP_SECURE: "true"
-      HTTP_ROOT: "https://ci.joomla.org/artifacts"
+      HTTP_ROOT: "https://artifacts.joomla.org/drone"
       DRONE_PULL_REQUEST: DRONE_PULL_REQUEST
       DRONE_COMMIT: DRONE_COMMIT
+    commands:
+      - /bin/drone_prepare_package.sh
+
+  - name: upload
+    image: joomlaprojects/docker-images:packager
+    environment:
+      package_key:
+        from_secret: package_key
+      package_user:
+        from_secret: package_user
+      package_host:
+        from_secret: package_host
+      package_root:
+        from_secret: package_root
       GITHUB_TOKEN:
         from_secret: github_token
     commands:
-      - if [ $DRONE_REPO_NAME != 'joomla-cms' ]; then echo "The packager only runs on the joomla/joomla-cms repo"; exit 0; fi
-      - /bin/drone_build.sh
-    volumes:
-      - name: reference
-        path: /reference
-    when:
-      repo:
-        - joomla/joomla-cms
+      - mkdir -p ~/.ssh
+      - eval $(ssh-agent -s)
+      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+      - echo "$package_key" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - ssh-add
+      - rclone config create package sftp host $package_host user $package_user port 22
+      - rclone copy ./upload/ package:$package_root/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/downloads/$DRONE_BUILD_NUMBER
+      - /bin/add_github_status.sh "Download" "Prebuilt packages are available for download." "https://artifacts.joomla.org/drone/${DRONE_REPO}/${DRONE_BRANCH}/${DRONE_PULL_REQUEST}/downloads/${DRONE_BUILD_NUMBER}"
+
+trigger:
+  repo:
+    - joomla/joomla-cms
 
 ---
 kind: pipeline
@@ -335,8 +345,8 @@ steps:
         from_secret: nightly_user
       nightly_host:
         from_secret: nightly_host
-      RINGCENTRAL_WEBHOOK:
-        from_secret: notification_url
+      MATTERMOST_NIGHTLY_HOOK:
+        from_secret: mattermost_nightly_hook
     commands:
       - export MINORVERSION=${DRONE_BRANCH%-*}
       - mkdir -p ~/.ssh
@@ -349,15 +359,15 @@ steps:
       - rclone delete nightly:/home/devj/public_html/nightlies/ --include "Joomla_$MINORVERSION.*"
       - rclone delete nightly:/home/devj/public_html/cache/com_content/
       - rclone copy ./transfer/ nightly:/home/devj/public_html/nightlies/
-      - /bin/notify
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) successfully built."}' $MATTERMOST_NIGHTLY_HOOK
 
   - name: buildfailure
     image: joomlaprojects/docker-images:packager
     environment:
-      RINGCENTRAL_WEBHOOK:
-        from_secret: notification_url
+      MATTERMOST_NIGHTLY_HOOK:
+        from_secret: mattermost_nightly_hook
     commands:
-      - /bin/notify
+      - curl -i -X POST -H 'Content-Type:application/json' -d '{"text":"Nightly Build for [Joomla 5.1](https://developer.joomla.org/nightly-builds.html) FAILED to built."}' $MATTERMOST_NIGHTLY_HOOK
     when:
       status:
         - failure
@@ -372,6 +382,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 45b19b7430edc5ec922ef32c2f2dcb284c7cbf7ba55eb295ba4d877cee0fe5a4
+hmac: 3cea0dbbf3e13e88b16369bbbbd85531791831bbc8f083fdae4928b3122fbf7c
 
 ...

administrator/components/com_fields/src/Helper/FieldsHelper.php

@@ -227,7 +227,10 @@ function ($f) {
                     ]))->getArgument('result', []);
 
                     if (\is_array($value)) {
-                        $value = implode(' ', $value);
+                        $value = array_filter($value, function ($v) {
+                            return $v !== '' && $v !== null;
+                        });
+                        $value = $value ? implode(' ', $value) : '';
                     }
 
                     /*

administrator/components/com_fields/src/Plugin/FieldsPlugin.php

@@ -92,7 +92,7 @@ public function prepareField(PrepareFieldEvent $event)
     {
         $result = $this->onCustomFieldsPrepareField($event->getContext(), $event->getItem(), $event->getField());
 
-        if ($result) {
+        if ($result !== '' && $result !== null) {
             $event->addResult($result);
         }
     }
@@ -269,10 +269,6 @@ public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form
             $node->setAttribute('showon', $showon_attribute);
         }
 
-        if ($layout = $field->params->get('form_layout')) {
-            $node->setAttribute('layout', $layout);
-        }
-
         if ($field->default_value !== '') {
             $defaultNode = $node->appendChild(new \DOMElement('default'));
             $defaultNode->appendChild(new \DOMCdataSection($field->default_value));
@@ -282,6 +278,12 @@ public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form
         $params = clone $this->params;
         $params->merge($field->fieldparams);
 
+        $layout = $field->params->get('form_layout', $this->params->get('form_layout', ''));
+
+        if ($layout) {
+            $node->setAttribute('layout', $layout);
+        }
+
         // Set the specific field parameters
         foreach ($params->toArray() as $key => $param) {
             if (\is_array($param)) {

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

@@ -294,7 +294,9 @@ public function save()
             $this->setMessage(Text::_('COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 'error');
 
             return;
-        } elseif (str_ends_with(end($explodeArray), Path::clean($data['filename'], '/'))) {
+        }
+
+        if (str_ends_with(end($explodeArray), Path::clean($data['filename'], '/'))) {
             $this->setMessage(Text::_('COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 'error');
 
             return;

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

@@ -470,7 +470,9 @@ public function getCoreFile($file, $client_id)
             $coreFile = Path::find($htmlPath, $fileName);
 
             return $coreFile;
-        } elseif (stristr($type, 'com_') !== false) {
+        }
+
+        if (stristr($type, 'com_') !== false) {
             // For components
             $folder    = $explodeArray['2'];
             $subFolder = $explodeArray['3'];
@@ -488,7 +490,9 @@ public function getCoreFile($file, $client_id)
             }
 
             return $coreFile;
-        } elseif (stristr($type, 'layouts') !== false) {
+        }
+
+        if (stristr($type, 'layouts') !== false) {
             // For Layouts
             $subtype = $explodeArray['3'];
 
@@ -501,8 +505,11 @@ public function getCoreFile($file, $client_id)
                 $coreFile  = Path::find($htmlPath, $fileName);
 
                 return $coreFile;
-            } elseif (stristr($subtype, 'joomla') || stristr($subtype, 'libraries') || stristr($subtype, 'plugins')) {
+            }
+
+            if (stristr($subtype, 'joomla') || stristr($subtype, 'libraries') || stristr($subtype, 'plugins')) {
                 $subFolder = \array_slice($explodeArray, 3, -1);
+
                 $subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
                 $htmlPath  = Path::clean($layoutPath . $subFolder);
                 $fileName  = $this->getSafeName($fileName);

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

@@ -33,8 +33,9 @@
     <form action="<?php echo Route::_('index.php?option=com_users&view=users&layout=modal&tmpl=component&groups=' . $input->get('groups', '', 'BASE64') . '&excluded=' . $input->get('excluded', '', 'BASE64')); ?>" method="post" name="adminForm" id="adminForm">
         <?php if (!$userRequired) : ?>
         <div>
-            <button type="button" class="btn btn-primary button-select" data-user-value="0" data-user-name="<?php echo $this->escape(Text::_('JLIB_FORM_SELECT_USER')); ?>"
-                data-user-field="<?php echo $this->escape($field); ?>"><?php echo Text::_('JOPTION_NO_USER'); ?></button>&nbsp;
+            <button type="button" class="btn btn-primary button-select"
+                data-content-select data-content-type="com_users.user" data-id="" data-name=""
+                data-user-value="" data-user-name="" data-user-field="<?php echo $this->escape($field); ?>"><?php echo Text::_('JOPTION_NO_USER'); ?></button>&nbsp;
         </div>
         <?php endif; ?>
         <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>

administrator/language/en-GB/com_contact.ini

@@ -52,7 +52,7 @@ COM_CONTACT_FIELD_CONFIG_TABLE_OF_CONTACTS_DESC="These settings apply for Contac
 COM_CONTACT_FIELD_CONFIG_VCARD_LABEL="vCard"
 COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL="Contact Category"
 COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL="Contact Select List"
-COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias"
+COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 COM_CONTACT_FIELD_CREATED_LABEL="Created Date"
 COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"
 COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Contact Form"

administrator/language/en-GB/com_fields.ini

@@ -21,7 +21,6 @@ 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"
-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_finder.ini

@@ -71,7 +71,7 @@ COM_FINDER_EDIT_PLUGIN_SETTINGS="Edit Plugin Settings"
 COM_FINDER_EMPTYSTATE_BUTTON_ADD="Start the indexer"
 COM_FINDER_EMPTYSTATE_CONTENT="No content has been indexed or you have deleted all your maps. Please visit the Smart Search Index page to reindex your content."
 COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT="There are no phrases used for site searching to view yet."
-COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL="Alias"
+COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 COM_FINDER_FIELD_CREATED_BY_LABEL="Created By"
 COM_FINDER_FIELD_FINDER_PLUGIN_LABEL="Finder Plugin"
 COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION="These options influence how the content is indexed. After changing settings here, the index needs to be rebuilt."

administrator/language/en-GB/joomla.ini

@@ -415,8 +415,8 @@ JGLOBAL_FIELD_ADD="Add"
 JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select the Top Level Category"
 JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one."
 JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Alternative Description"
-JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
-JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the item."
+JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
 JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
 JGLOBAL_FIELD_CREATED_DESC="Created Date."

administrator/language/en-GB/lib_joomla.ini

@@ -300,6 +300,9 @@ JLIB_FORM_FIELD_PARAM_INTEGER_LAST_DESC="This value is the highest in the list."
 JLIB_FORM_FIELD_PARAM_INTEGER_LAST_LABEL="Last"
 JLIB_FORM_FIELD_PARAM_INTEGER_STEP_DESC="Each option will be the previous option incremented by this integer, starting with the first value until the last value is reached."
 JLIB_FORM_FIELD_PARAM_INTEGER_STEP_LABEL="Step"
+JLIB_FORM_FIELD_PARAM_LAYOUT_BASIC_SELECT="HTML Select"
+JLIB_FORM_FIELD_PARAM_LAYOUT_FANCY_SELECT="Enhanced Select"
+JLIB_FORM_FIELD_PARAM_LAYOUT_LABEL="Form Layout"
 JLIB_FORM_FIELD_PARAM_LIST_MULTIPLE_DESC="Allow multiple values to be selected."
 JLIB_FORM_FIELD_PARAM_LIST_MULTIPLE_LABEL="Multiple"
 JLIB_FORM_FIELD_PARAM_LIST_MULTIPLE_VALUES_DESC="The options of the list."

administrator/language/en-GB/plg_fields_list.ini

@@ -5,7 +5,6 @@
 
 PLG_FIELDS_LIST="Fields - List"
 PLG_FIELDS_LIST_LABEL="List (%s)"
-PLG_FIELDS_LIST_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL="Multiple"
 PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL="List Values"
 PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL="Text"

administrator/language/en-GB/plg_fields_sql.ini

@@ -6,7 +6,6 @@
 PLG_FIELDS_SQL="Fields - SQL"
 PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create or edit an SQL field!"
 PLG_FIELDS_SQL_LABEL="SQL (%s)"
-PLG_FIELDS_SQL_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_SQL_PARAMS_HEADER_DESC="Add a string with no value at the top of the dropdown list eg ' - Select Article - '."
 PLG_FIELDS_SQL_PARAMS_HEADER_LABEL="Header"
 PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"

api/components/com_content/src/Serializer/ContentSerializer.php

@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Serializer\JoomlaSerializer;
+use Joomla\CMS\Tag\TagApiSerializerTrait;
 use Joomla\CMS\Uri\Uri;
 use Tobscure\JsonApi\Collection;
 use Tobscure\JsonApi\Relationship;
@@ -27,6 +28,8 @@
  */
 class ContentSerializer extends JoomlaSerializer
 {
+    use TagApiSerializerTrait;
+
     /**
      * Build content relationships by associations
      *
@@ -45,7 +48,10 @@ public function languageAssociations($model)
 
         foreach ($model->associations as $association) {
             $resources[] = (new Resource($association, $serializer))
-                ->addLink('self', Route::link('site', Uri::root() . 'api/index.php/v1/content/articles/' . $association->id));
+                ->addLink(
+                    'self',
+                    Route::link('site', Uri::root() . 'api/index.php/v1/content/articles/' . $association->id)
+                );
         }
 
         $collection = new Collection($resources, $serializer);
@@ -67,7 +73,10 @@ public function category($model)
         $serializer = new JoomlaSerializer('categories');
 
         $resource = (new Resource($model->catid, $serializer))
-            ->addLink('self', Route::link('site', Uri::root() . 'api/index.php/v1/content/categories/' . $model->catid));
+            ->addLink(
+                'self',
+                Route::link('site', Uri::root() . 'api/index.php/v1/content/categories/' . $model->catid)
+            );
 
         return new Relationship($resource);
     }

api/language/en-GB/joomla.ini

@@ -409,8 +409,8 @@ JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this c
 JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select the Top Level Category"
 JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one."
 JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Alternative Description"
-JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
-JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the item."
+JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
 JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
 JGLOBAL_FIELD_CREATED_DESC="Created Date."

build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js

@@ -2,6 +2,7 @@
  * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
+// @TODO: remove the specific conditional on plg_system_shortcut/js/shortcut.es6.js when this moves to JoomlaDialog
 window.tinymce.PluginManager.add('joomlaHighlighter', (editor) => {
   const setContent = (html) => {
     editor.focus();

build/media_source/plg_system_shortcut/js/shortcut.es6.js

@@ -49,6 +49,13 @@
       if (target.type === 'checkbox') {
         return true;
       }
+
+      // Ignore TinyMCE joomlaHighlighter plugin,
+      // @TODO: remove this when the joomlaHighlighter plugin will use JoomlaDialog
+      if (target.classList.contains('tox-textarea-wrap') && target.closest('.joomla-highlighter-dialog')) {
+        return false;
+      }
+
       // Default hotkeys filter behavior
       return !(target.isContentEditable || tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA');
     };

components/com_banners/src/Helper/BannerHelper.php

@@ -29,6 +29,9 @@ abstract class BannerHelper
      * @return  boolean  True if an image of type bmp, gif, jp(e)g, png or webp, false otherwise
      *
      * @since   1.6
+     *
+     * @deprecated  5.1 will be removed in 7.0
+     *              Use MediaHelper::isImage($url) instead
      */
     public static function isImage($url)
     {

language/en-GB/com_contact.ini

@@ -35,7 +35,7 @@ COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact in this category has the same al
 COM_CONTACT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Contact in this category has the same alias."
 COM_CONTACT_FAX="Fax"
 COM_CONTACT_FAX_NUMBER="Fax: %s"
-COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias"
+COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 COM_CONTACT_FIELD_INFORMATION_ADDRESS_LABEL="Address"
 COM_CONTACT_FIELD_INFORMATION_COUNTRY_LABEL="Country"
 COM_CONTACT_FIELD_INFORMATION_FAX_LABEL="Fax"

language/en-GB/joomla.ini

@@ -276,8 +276,8 @@ JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this c
 JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select the Top Level Category"
 JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one."
 JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Alternative Description"
-JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
-JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the item."
+JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
 JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
 JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
 JGLOBAL_FIELD_CREATED_DESC="Created Date."

libraries/src/Application/ConsoleApplication.php

@@ -252,6 +252,7 @@ public function execute()
         $this->populateHttpHost();
 
         // Import CMS plugin groups to be able to subscribe to events
+        PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
         PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
         PluginHelper::importPlugin('console', null, true, $this->getDispatcher());