Merge branch '4.0-dev' into feature/4.0-dev-a11y--com_finder-refactor…

…-search-result

administrator/components/com_fields/src/Model/FieldsModel.php

@@ -240,7 +240,7 @@ protected function getListQuery()
 				$query->where(
 					'(' .
 						$db->quoteName('fc.category_id') . ' IS NULL OR ' .
-						$db->quoteName('fc.category_id') . ' IN (' . implode(',', $query->bindArray($categories, ParameterType::INTEGER)) . ')' .
+						$db->quoteName('fc.category_id') . ' IN (' . implode(',', $query->bindArray(array_values($categories), ParameterType::INTEGER)) . ')' .
 					')'
 				);
 			}

administrator/components/com_languages/src/Helper/MultilangstatusHelper.php

@@ -88,6 +88,7 @@ public static function getContentlangs()
 				[
 					$db->quoteName('lang_code'),
 					$db->quoteName('published'),
+					$db->quoteName('sef'),
 				]
 			)
 			->from($db->quoteName('#__languages'));

administrator/components/com_languages/tmpl/multilangstatus/default.php

@@ -113,6 +113,13 @@
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED', $contentlang->lang_code); ?>
 				</div>
 			<?php endif; ?>
+			<?php if (empty($contentlang->sef)) : ?>
+				<div class="alert alert-error">
+					<span class="fas fa-exclamation" aria-hidden="true"></span>
+					<span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
+					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING', $contentlang->lang_code); ?>
+				</div>
+			<?php endif; ?>
 		<?php endforeach; ?>
 		<?php if ($this->listUsersError) : ?>
 			<div class="alert alert-warning">

administrator/components/com_media/resources/scripts/app/Api.js

@@ -244,24 +244,29 @@ class Api {
      * @TODO DN improve error handling
      */
     _handleError(error) {
-        switch (error.status) {
-            case 409:
-                // Handled in consumer
-                break;
-            case 404:
-                notifications.error('COM_MEDIA_ERROR_NOT_FOUND');
-                break;
-            case 401:
-                notifications.error('COM_MEDIA_ERROR_NOT_AUTHENTICATED');
-                break;
-            case 403:
-                notifications.error('COM_MEDIA_ERROR_NOT_AUTHORIZED');
-                break;
-            case 500:
-                notifications.error('COM_MEDIA_SERVER_ERROR');
-                break;
-            default:
-                notifications.error('COM_MEDIA_ERROR');
+        const response = JSON.parse(error.response);
+        if (response.message) {
+            notifications.error(response.message);
+        } else {
+            switch (error.status) {
+                case 409:
+                    // Handled in consumer
+                    break;
+                case 404:
+                    notifications.error('COM_MEDIA_ERROR_NOT_FOUND');
+                    break;
+                case 401:
+                    notifications.error('COM_MEDIA_ERROR_NOT_AUTHENTICATED');
+                    break;
+                case 403:
+                    notifications.error('COM_MEDIA_ERROR_NOT_AUTHORIZED');
+                    break;
+                case 500:
+                    notifications.error('COM_MEDIA_SERVER_ERROR');
+                    break;
+                default:
+                    notifications.error('COM_MEDIA_ERROR');
+            }
         }
 
         throw error;

administrator/components/com_media/src/Controller/ApiController.php

@@ -356,7 +356,7 @@ private function checkContent()
 		$helper       = new MediaHelper;
 		$serverlength = $this->input->server->getInt('CONTENT_LENGTH');
 
-		if ($serverlength > ($params->get('upload_maxsize', 0) * 1024 * 1024)
+		if (($params->get('upload_maxsize', 0) > 0 && $serverlength > ($params->get('upload_maxsize', 0) * 1024 * 1024))
 			|| $serverlength > $helper->toBytes(ini_get('upload_max_filesize'))
 			|| $serverlength > $helper->toBytes(ini_get('post_max_size'))
 			|| $serverlength > $helper->toBytes(ini_get('memory_limit')))

administrator/components/com_media/tmpl/media/default_texts.php

@@ -31,6 +31,7 @@
 Text::script('COM_MEDIA_ERROR_NOT_AUTHENTICATED', true);
 Text::script('COM_MEDIA_ERROR_NOT_AUTHORIZED', true);
 Text::script('COM_MEDIA_ERROR_NOT_FOUND', true);
+Text::script('COM_MEDIA_ERROR_WARNFILETOOLARGE', true);
 Text::script('COM_MEDIA_FILE', true);
 Text::script('COM_MEDIA_FILE_EXISTS_AND_OVERRIDE', true);
 Text::script('COM_MEDIA_FOLDER', true);

administrator/language/en-GB/com_languages.ini

@@ -66,10 +66,11 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_HOME_UNPUBLISHED="Both the <strong>%s</strong> Content Language and its Home page are unpublished. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING="The <strong>%s</strong> Content Language has been deleted although the corresponding Site Language is enabled and a Home page is assigned to this language. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
+COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING="The \"URL Language Code\" is missing for the <strong>%s</strong> Content Language. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The <strong>%s</strong> Content Language is trashed. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="The menu module displaying the Home menu item set to language &quot;All&quot; should not be published."
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. <strong>The language will not display on the site.</strong>"
-COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the <strong>%s</strong> default Site Language is unpublished or does not exist. <strong>If not corrected, the multilingual feature may not function properly or the site may not be reachable!</strong>"
+COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the <strong>%s</strong> default Site Language is unpublished or does not exist. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> does not have a matching Site Language tag. Check that the Site Language is installed and enabled AND the correct language tag is used for the Content Language. Example: for English (en-GB) both tags should be 'en-GB'. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages"

administrator/language/en-GB/com_media.ini

@@ -28,6 +28,7 @@ COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please en
 COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."
 COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorized"
 COM_MEDIA_ERROR_NOT_FOUND="File or Folder not found"
+COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
 COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to attempt to verify files. Try disabling this if you get invalid mime type errors."
 COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
 COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."

administrator/language/en-GB/com_privacy.ini

@@ -60,8 +60,8 @@ COM_PRIVACY_EXTENSION_CAPABILITY_PERSONAL_INFO="In order to process information
 ; [FORMURL]   URL of the confirm page where the user can paste their token.
 ; [TOKEN]     The confirmation token.
 ; \n          Newline character. Use it to start a new line in the email.
-COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_EXPORT_REQUEST="An administrator for [URL] has created a request to export personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information from this website.\n\nIf this was a mistake, just ignore this email and nothing will happen.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
-COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_REMOVE_REQUEST="An administrator for [URL] has created a request to remove all personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information to be removed from this website.\n\nIf this was a mistake, just ignore this email and nothing will happen.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_EXPORT_REQUEST="An administrator for [URL] has created a request to export personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information from this website.\n\nIf this was a mistake, ignore this email and nothing will happen.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
+COM_PRIVACY_EMAIL_ADMIN_REQUEST_BODY_REMOVE_REQUEST="An administrator for [URL] has created a request to remove all personal information related to this email address. As a security measure, you must confirm that this is a valid request for your personal information to be removed from this website.\n\nIf this was a mistake, ignore this email and nothing will happen.\n\nIn order to confirm this request, you can complete one of the following tasks:\n\n1. Visit the following URL: [TOKENURL]\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: [FORMURL]\nToken: [TOKEN]\n\nPlease note that this token is only valid for 24 hours from the time this email was sent."
 COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_EXPORT_REQUEST="Information Request Created at [SITENAME]"
 COM_PRIVACY_EMAIL_ADMIN_REQUEST_SUBJECT_REMOVE_REQUEST="Information Deletion Request Created at [SITENAME]"
 COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY="An administrator for [URL] has completed the data export you requested and a copy of the information can be found in the file attached to this message."

administrator/language/en-GB/com_users.ini

@@ -42,7 +42,7 @@ COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL="Frontend User Parameters"
 COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL="Guest User Group"
 COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL="Mailbody Suffix"
 COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL="Send Mail to Administrators"
-COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS="Minimum Digits"
+COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS="Minimum Numbers"
 COM_USERS_CONFIG_FIELD_MINIMUM_LOWERCASE="Minimum Lower Case"
 COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH="Minimum Characters"
 COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS="Minimum Symbols"

administrator/language/en-GB/joomla.ini

@@ -263,8 +263,8 @@ JFIELD_ORDERING_LABEL="Ordering"
 JFIELD_PARAMS_LABEL="Options"
 JFIELD_PASSWORD_INDICATE_COMPLETE="Password accepted"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="Password doesn't meet site's requirements."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
+JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N="Password does not have enough numbers. At least %s numbers are required."
+JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough numbers. At least 1 number is required."
 JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N="Password does not have enough lower case characters. At least %s lower case characters are required."
 JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N_1="Password does not have enough lower case characters. At least 1 lower case character is required."
 JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
@@ -274,7 +274,7 @@ JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough
 JFIELD_PASSWORD_NOTE_DESC="%1 symbol(s), %2 uppercase letter(s), %3 lowercase letter(s), %4 number(s)"
 JFIELD_PASSWORD_NOTE_LBL="Password must contain:"
 JFIELD_PASSWORD_RULES_CHARACTERS="Characters: %d"
-JFIELD_PASSWORD_RULES_DIGITS="Digits: %d"
+JFIELD_PASSWORD_RULES_DIGITS="Numbers: %d"
 JFIELD_PASSWORD_RULES_LOWERCASE="Lower Case: %d"
 JFIELD_PASSWORD_RULES_MINIMUM_REQUIREMENTS="<strong>Minimum Requirements</strong> — %s"
 JFIELD_PASSWORD_RULES_SYMBOLS="Symbols: %d"

build/media_source/mod_articles_news/css/template.css

@@ -0,0 +1,31 @@
+.mod-articlesnews-horizontal {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  list-style: none;
+}
+.mod-articlesnews-horizontal figure img {
+  width: 100%;
+}
+.mod-articlesnews-horizontal li {
+  display: flex;
+  flex: 1 1 300px;
+  flex-direction: column;
+}
+.mod-articlesnews-horizontal li:not(:last-child) {
+  margin-right: 2rem;
+}
+.mod-articlesnews-horizontal .readmore {
+  margin-top: auto;
+}
+
+@supports (display: grid) {
+  .mod-articlesnews-horizontal {
+    display: grid;
+    grid-gap: 2rem;
+    grid-template-columns: repeat(auto-fit, minmax(330px, 1fr));
+  }
+  .mod-articlesnews-horizontal li:not(:last-child) {
+    margin-right: 0;
+  }
+}

build/media_source/system/js/core.es6/text.es6

@@ -42,7 +42,7 @@
         Joomla.loadOptions({ 'joomla.jtext': null });
       }
 
-      newDef = newDef === undefined ? '' : newDef;
+      newDef = newDef === undefined ? newKey : newDef;
       newKey = newKey.toUpperCase();
 
       return Joomla.Text.strings[newKey] !== undefined ? Joomla.Text.strings[newKey] : newDef;

components/com_finder/tmpl/search/default_form.php

@@ -27,6 +27,9 @@
 <form action="<?php echo Route::_($this->query->toUri()); ?>" method="get" class="js-finder-searchform">
 	<?php echo $this->getFields(); ?>
 	<fieldset class="com-finder__search word mb-3">
+		<legend class="com-finder__search-legend sr-only">
+			<?php echo Text::_('COM_FINDER_SEARCH_FORM_LEGEND'); ?>
+		</legend>
 		<div class="form-inline">
 			<label for="q" class="mr-2">
 				<?php echo Text::_('COM_FINDER_SEARCH_TERMS'); ?>
@@ -49,7 +52,10 @@
 	</fieldset>
 
 	<?php if ($this->params->get('show_advanced', 1)) : ?>
-		<div id="advancedSearch" class="com-finder__advanced js-finder-advanced collapse<?php if ($this->params->get('expand_advanced', 0)) echo ' show'; ?>">
+		<fieldset id="advancedSearch" class="com-finder__advanced js-finder-advanced collapse<?php if ($this->params->get('expand_advanced', 0)) echo ' show'; ?>">
+			<legend class="com-finder__search-advanced sr-only">
+				<?php echo Text::_('COM_FINDER_SEARCH_ADVANCED_LEGEND'); ?>
+			</legend>
 			<?php if ($this->params->get('show_advanced_tips', 1)) : ?>
 				<div class="com-finder__tips card card-outline-secondary mb-3">
 					<div class="card-body">
@@ -67,6 +73,6 @@
 			<div id="finder-filter-window" class="com-finder__filter">
 				<?php echo HTMLHelper::_('filter.select', $this->query, $this->params); ?>
 			</div>
-		</div>
+		</fieldset>
 	<?php endif; ?>
 </form>

installation/language/en-GB/joomla.ini

@@ -273,16 +273,6 @@ JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data.
 ; Field password messages
 JFIELD_PASSWORD_INDICATE_COMPLETE="Password accepted"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="Password doesn't meet site's requirements."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
-JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N="Password does not have enough lower case characters. At least %s lower case characters are required."
-JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N_1="Password does not have enough lower case characters. At least 1 lower case character is required."
-JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
-JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
-JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required."
-JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required."
-JFIELD_PASSWORD_NOTE_DESC="%1 symbol(s), %2 uppercase letter(s), %3 lowercase letter(s), %4 number(s)"
-JFIELD_PASSWORD_NOTE_LBL="Password must contain:"
 JFIELD_PASSWORD_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."
 JFIELD_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
 JFIELD_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."

installation/language/en-US/joomla.ini

@@ -273,16 +273,6 @@ JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data.
 ; Field password messages
 JFIELD_PASSWORD_INDICATE_COMPLETE="Password accepted"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="Password doesn't meet site's requirements."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
-JFIELD_PASSWORD_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
-JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N="Password does not have enough lower case characters. At least %s lower case characters are required."
-JFIELD_PASSWORD_NOT_ENOUGH_LOWERCASE_LETTERS_N_1="Password does not have enough lower case characters. At least 1 lower case character is required."
-JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
-JFIELD_PASSWORD_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
-JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required."
-JFIELD_PASSWORD_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required."
-JFIELD_PASSWORD_NOTE_DESC="%1 symbol(s), %2 uppercase letter(s), %3 lowercase letter(s), %4 number(s)"
-JFIELD_PASSWORD_NOTE_LBL="Password must contain:"
 JFIELD_PASSWORD_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."
 JFIELD_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
 JFIELD_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."

installation/src/Application/InstallationApplication.php

@@ -406,7 +406,7 @@ public function getTemplate($params = false)
 			$template->template = 'template';
 			$template->params = new Registry;
 			$template->inheritable = 0;
-			$template->parent = null;
+			$template->parent = '';
 
 			return $template;
 		}

language/en-GB/com_finder.ini

@@ -41,6 +41,8 @@ COM_FINDER_QUERY_TOKEN_EXCLUDED="<span class=\"term\">%s</span> should be exclud
 COM_FINDER_QUERY_TOKEN_GLUE=", and "
 COM_FINDER_QUERY_TOKEN_OPTIONAL="<span class=\"term\">%s</span> is optional"
 COM_FINDER_QUERY_TOKEN_REQUIRED="<span class=\"term\">%s</span> is required"
+COM_FINDER_SEARCH_ADVANCED_LEGEND="Advanced Search"
+COM_FINDER_SEARCH_FORM_LEGEND="Search Form"
 COM_FINDER_SEARCH_NO_RESULTS_BODY="No search results could be found for query: %s."
 COM_FINDER_SEARCH_NO_RESULTS_BODY_MULTILANG="No search results in English (en-GB) could be found for query: %s."
 COM_FINDER_SEARCH_NO_RESULTS_HEADING="No Results Found"