Merge branch '4.0-dev' into j4test_integration

.github/CODEOWNERS

@@ -35,22 +35,22 @@ libraries/src/Updater/*  @rdeutz @wilsonge @zero-24
 build/jenkins/*  @rdeutz
 build/travis/*  @rdeutz
 tests/codeception/*  @rdeutz
-tests/javascript/*  @dgrammatiko @rdeutz
+tests/javascript/*  @wilsonge @rdeutz
 tests/unit/*  @rdeutz
 .appveyor.yml  @rdeutz
 .drone.yml  @rdeutz
 .hound.yml  @wilsonge
 .travis.yml  @rdeutz
 appveyor-phpunit.xml  @rdeutz
 codeception.yml  @rdeutz
-karma.conf.js  @dgrammatiko @rdeutz
+karma.conf.js  @wilsonge @rdeutz
 phpunit.xml.dist  @rdeutz
 RoboFile.dist.ini  @rdeutz
 RoboFile.php  @rdeutz
 travis-phpunit.xml  @rdeutz
 
 # Core JS
-media/*/js/*  @dgrammatiko
+media/*/js/*  @wilsonge
 
 # CSP Tooling
 plugins/system/httpheaders/*  @zero-24

administrator/components/com_actionlogs/Helper/ActionlogsHelper.php

@@ -183,6 +183,18 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 			$messageData['extension_name'] = Text::_($messageData['extension_name']);
 		}
 
+		// Translating application
+		if (isset($messageData['app']))
+		{
+			$messageData['app'] = Text::_($messageData['app']);
+		}
+
+		// Translating type
+		if (isset($messageData['type']))
+		{
+			$messageData['type'] = Text::_($messageData['type']);
+		}
+
 		$linkMode = Factory::getApplication()->get('force_ssl', 0) >= 1 ? 1 : -1;
 
 		foreach ($messageData as $key => $value)
@@ -198,7 +210,7 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 				$value = $links[$value];
 			}
 
-			$message = str_replace('{' . $key . '}', Text::_($value), $message);
+			$message = str_replace('{' . $key . '}', $value, $message);
 		}
 
 		return $message;

administrator/components/com_config/Field/FiltersField.php

@@ -179,13 +179,6 @@ protected function getInput()
 		// Close the table.
 		$html[] = '</table>';
 
-		// Add notes
-		$html[] = '<div class="filter-notes">';
-		$html[] = '<p>' . Text::_('JGLOBAL_FILTER_TYPE_DESC') . '</p>';
-		$html[] = '<p>' . Text::_('JGLOBAL_FILTER_TAGS_DESC') . '</p>';
-		$html[] = '<p>' . Text::_('JGLOBAL_FILTER_ATTRIBUTES_DESC') . '</p>';
-		$html[] = '</div>';
-
 		return implode("\n", $html);
 	}
 

administrator/components/com_config/tmpl/application/default_filters.php

@@ -14,5 +14,4 @@
 
 $this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
 $this->fieldsname = 'filters';
-$this->description = Text::_('COM_CONFIG_TEXT_FILTERS_DESC');
 echo LayoutHelper::render('joomla.content.text_filters', $this);

administrator/components/com_content/Model/ArticleModel.php

@@ -528,6 +528,8 @@ public function getItem($pk = null)
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
+		$app = Factory::getApplication();
+
 		// Get the form.
 		$form = $this->loadForm('com_content.article', 'article', array('control' => 'jform', 'load_data' => $loadData));
 
@@ -536,7 +538,7 @@ public function getForm($data = array(), $loadData = true)
 			return false;
 		}
 
-		$jinput = Factory::getApplication()->input;
+		$jinput = $app->input;
 
 		/*
 		 * The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
@@ -551,7 +553,16 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('catid', 'action', 'core.edit');
 
 			// Existing record. Can only edit own articles in selected categories.
-			$form->setFieldAttribute('catid', 'action', 'core.edit.own');
+			if ($app->isClient('administrator'))
+			{
+				$form->setFieldAttribute('catid', 'action', 'core.edit.own');
+			}
+			else
+			// Existing record. We can't edit the category in frontend.
+			{
+				$form->setFieldAttribute('catid', 'readonly', 'true');
+				$form->setFieldAttribute('catid', 'filter', 'unset');
+			}
 
 			$table = $this->getTable();
 
@@ -633,7 +644,6 @@ public function getForm($data = array(), $loadData = true)
 		}
 
 		// Prevent messing with article language and category when editing existing article with associations
-		$app = Factory::getApplication();
 		$assoc = Associations::isEnabled();
 
 		// Check if article is associated

administrator/components/com_fields/Plugin/FieldsPlugin.php

@@ -141,6 +141,12 @@ public function onCustomFieldsPrepareField($context, $item, $field)
 			return;
 		}
 
+		// Check if the field should be displayed on the form
+		if (!FieldsHelper::displayFieldOnForm($field))
+		{
+			return;
+		}
+
 		// Merge the params from the plugin and field which has precedence
 		$fieldParams = clone $this->params;
 		$fieldParams->merge($field->fieldparams);

administrator/components/com_installer/Model/UpdateModel.php

@@ -267,9 +267,6 @@ public function getDisabledUpdateSites()
 	 */
 	public function findUpdates($eid = 0, $cache_timeout = 0, $minimum_stability = Updater::STABILITY_STABLE)
 	{
-		// Purge the updates list
-		$this->purge();
-
 		Updater::getInstance()->findUpdates($eid, $cache_timeout, $minimum_stability);
 
 		return true;
@@ -474,22 +471,27 @@ private function install($update)
 		if (!$installer->update($package['dir']))
 		{
 			// There was an error updating the package
-			$msg    = Text::sprintf('COM_INSTALLER_MSG_UPDATE_ERROR', Text::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$app->enqueueMessage(
+				Text::sprintf('COM_INSTALLER_MSG_UPDATE_ERROR',
+					Text::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type']))
+				), 'error'
+			);
 			$result = false;
 		}
 		else
 		{
 			// Package updated successfully
-			$msg    = Text::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', Text::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$app->enqueueMessage(
+				Text::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS',
+					Text::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type']))
+				)
+			);
 			$result = true;
 		}
 
 		// Quick change
 		$this->type = $package['type'];
 
-		// Set some model state values
-		$app->enqueueMessage($msg);
-
 		// TODO: Reconfigure this code when you have more battery life left
 		$this->setState('name', $installer->get('name'));
 		$this->setState('result', $result);

administrator/components/com_users/Controller/ProfileController.php

@@ -36,6 +36,11 @@ class ProfileController extends BaseController
 	 */
 	public function gethelpsites()
 	{
+		if ($this->app->getIdentity()->guest)
+		{
+			throw new \Exception(Text::_('JERROR_ALERTNOAUTHOR'), 500);
+		}
+
 		// Set FTP credentials, if given
 		ClientHelper::setCredentialsFromRequest('ftp');
 

administrator/components/com_users/Model/UserModel.php

@@ -959,9 +959,9 @@ public function getAssignedGroups($userId = null)
 			}
 			else
 			{
-				$config = ComponentHelper::getParams('com_users');
+				$params = ComponentHelper::getParams('com_users');
 
-				if ($groupId = $config->get('new_usertype'))
+				if ($groupId = $params->get('new_usertype', $params->get('guest_usergroup', 1)))
 				{
 					$result[] = $groupId;
 				}

administrator/language/en-GB/en-GB.com_config.ini

@@ -178,5 +178,6 @@ COM_CONFIG_TEXT_FILTER_SETTINGS="Text Filter Settings"
 COM_CONFIG_TEXT_FILTERS="Text Filters"
 COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields in the selected groups.<br>These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site's needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with website attacks."
 COM_CONFIG_TEXT_FILTERS_NOTE="WARNING: You have configured a parent group with the setting 'No Filtering' - this setting can't be overridden in child groups and any other configured filter will not be applied."
+COM_CONFIG_TEXT_FILTERS_SUMMARY="Expand for notes about the text filters"
 COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
 JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items."

administrator/language/en-GB/en-GB.com_users.ini

@@ -182,10 +182,12 @@ COM_USERS_MASS_MAIL="Mass Mail Users"
 COM_USERS_MASS_MAIL_DESC="Mass Mail options."
 COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
 COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
+COM_USERS_MSG_NOT_ENOUGH_LOWERCASE_LETTERS_N="Password does not have enough lower case characters. At least %s lower case characters are required."
+COM_USERS_MSG_NOT_ENOUGH_LOWERCASE_LETTERS_N_1="Password does not have enough lower case characters. At least 1 lower case character is required."
 COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
 COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
-COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough uppercase characters. At least %s upper case characters are required."
-COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough uppercase characters. At least 1 upper case character is required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough upper case characters. At least %s upper case characters are required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough upper case characters. At least 1 upper case character is required."
 COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
 COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
 COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."

administrator/templates/atum/templateDetails.xml

@@ -3,7 +3,7 @@
 	<name>atum</name>
 	<version>1.0</version>
 	<creationDate>16/09/2016</creationDate>
-	<author>Charlie Lodder, Dimitris Grammatikogiannis, Ciaran Walsh, Elisa Foltyn</author>
+	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.</copyright>
 	<description>TPL_ATUM_XML_DESCRIPTION</description>

build/build-modules-js/javascript/minify-vendor.es6.js

@@ -16,7 +16,7 @@ module.exports.compile = () => {
         Path.join(RootPath, 'media/vendor/webcomponentsjs'),
       ];
 
-      // Loop to get some text for the packgage.json
+      // Loop to get some text for the package.json
       folders.forEach((folder) => {
         const files = WalkSync.run(folder, []);
 

build/build-modules-js/settings.json

@@ -382,6 +382,24 @@
         "css": {
           "src/css/SkipTo.css": "css/SkipTo.css"
         }
+      },
+      "qrcode-generator": {
+        "name": "qrcode",
+        "js": {
+          "qrcode.js": "js/qrcode.js",
+          "qrcode_SJIS.js": "js/qrcode_SJIS.js",
+          "qrcode_UTF8.js": "js/qrcode_UTF8.js"
+        },
+        "provideAssets": [
+          {
+            "name": null,
+            "js": [
+              "qrcode.js",
+              "qrcode_SJIS.js",
+              "qrcode_UTF8.js"
+            ]
+          }
+        ]
       }
     },
     "errorPages": {

build/media_source/com_associations/js/associations-edit.es6.js

@@ -17,7 +17,7 @@ Joomla = window.Joomla || {};
       if (el) {
         const attribute = el.getAttribute('for');
 
-        if (attribute.replace('_name', '') === `${formControl}_associations_${languageCode.replace('-', '_')}`) {
+        if (attribute.replace(new RegExp('_name$'), '') === `${formControl}_associations_${languageCode.replace('-', '_')}`) {
           element.style.display = 'none';
         }
       }

build/media_source/system/js/fields/calendar-locales/kk.js

@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Бүгін",
+	weekend : [0, 6],
+	wk : "апта",
+	time : "Уақыт:",
+	days : ["Жексенбі", "Дүйсенбі", "Сейсенбі", "Сәрсенбі", "Бейсенбі", "Жұма", "Сенбі"],
+	shortDays : ["Жекс", "Дүйс", "Сейс", "Сәрс", "Бейс", "Жұма", "Сенбі"],
+	months : ["Қаңтар", "Ақпан", "Наурыз", "Сәуір", "Мамыр", "Маусым", "Шілде", "Тамыз", "Қыркүйек", "Қазан", "Қараша", "Желтоқсан"],
+	shortMonths : ["Қаң", "Ақп", "Нау", "Сәу", "Мам", "Мау", "Шіл", "Там", "Қырк", "Қаз", "Қар", "Жел"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Жабу",
+	clear: "Өшіру"
+};

build/media_source/system/js/showon.es6.js

@@ -179,10 +179,12 @@
             // AND operator: both the previous and current conditions must be valid
             if (condition.op === 'AND' && condition.valid + elementShowonDatas[index - 1].valid < 2) {
               showfield = false;
+              condition.valid = 0;
             }
             // OR operator: one of the previous and current conditions must be valid
             if (condition.op === 'OR' && condition.valid + elementShowonDatas[index - 1].valid > 0) {
               showfield = true;
+              condition.valid = 1;
             }
           }
         });