Merge branch 'staging' into privacyconsentlayouts

.github/CODEOWNERS

@@ -7,11 +7,11 @@ plugins/fields/*  @laoneo
 plugins/systems/fields/*  @laoneo
 
 # Smart Search
-administrator/components/com_finder/*  @mbabker
-components/com_finder/*  @mbabker
-modules/mod_finder/*  @mbabker
-plugins/content/finder/*  @mbabker
-plugins/finder/*  @mbabker
+#administrator/components/com_finder/*
+#components/com_finder/*
+#modules/mod_finder/*
+#plugins/content/finder/*
+#plugins/finder/*
 
 # CodeMirror
 media/editors/codemirror/*  @okonomiyaki3000
@@ -21,33 +21,33 @@ plugins/editors/codemirror/*  @okonomiyaki3000
 plugins/system/stats/*  @mbabker @wilsonge
 
 # Release Tools
-build.xml  @mbabker
-build/build.php  @mbabker @rdeutz @wilsonge
-build/bump.php  @mbabker @rdeutz @wilsonge
-build/deleted_file_check.php  @mbabker @rdeutz @wilsonge
+build.xml  @wilsonge
+build/build.php  @rdeutz @wilsonge
+build/bump.php  @rdeutz @wilsonge
+build/deleted_file_check.php  @rdeutz @wilsonge
 
 # Core/Extension Install/Update Tools
-administrator/components/com_joomlaupdate/*  @mbabker @rdeutz @wilsonge @zero-24
-libraries/src/Installer/*  @mbabker @rdeutz @wilsonge @zero-24
-libraries/src/Updater/*  @mbabker @rdeutz @wilsonge @zero-24
+administrator/components/com_joomlaupdate/*  @rdeutz @wilsonge @zero-24
+libraries/src/Installer/*  @rdeutz @wilsonge @zero-24
+libraries/src/Updater/*  @rdeutz @wilsonge @zero-24
 
 # Automated Testing
-build/jenkins/*  @mbabker @rdeutz
-build/travis/*  @mbabker @rdeutz
+build/jenkins/*  @rdeutz
+build/travis/*  @rdeutz
 tests/codeception/*  @rdeutz
 tests/javascript/*  @dgrammatiko @rdeutz
-tests/unit/*  @mbabker @rdeutz
-.appveyor.yml  @mbabker @rdeutz
+tests/unit/*  @rdeutz
+.appveyor.yml  @rdeutz
 .drone.yml  @rdeutz
-.hound.yml  @mbabker
-.travis.yml  @mbabker @rdeutz
-appveyor-phpunit.xml  @mbabker @rdeutz
+.hound.yml  @wilsonge
+.travis.yml  @rdeutz
+appveyor-phpunit.xml  @rdeutz
 codeception.yml  @rdeutz
 karma.conf.js  @dgrammatiko @rdeutz
-phpunit.xml.dist  @mbabker @rdeutz
+phpunit.xml.dist  @rdeutz
 RoboFile.dist.ini  @rdeutz
 RoboFile.php  @rdeutz
-travis-phpunit.xml  @mbabker @rdeutz
+travis-phpunit.xml  @rdeutz
 
 # Core JS
 media/*/js/*  @dgrammatiko

.gitignore

@@ -193,6 +193,9 @@ Desktop.ini
 /libraries/vendor/simplepie/simplepie/build
 /libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
 /libraries/vendor/simplepie/simplepie/composer.json
+/libraries/vendor/typo3/phar-stream-wrapper/README.md
+/libraries/vendor/typo3/phar-stream-wrapper/LICENSE
+/libraries/vendor/typo3/phar-stream-wrapper/.gitignore
 
 # System Test related files
 tests/codeception/acceptance.suite.yml

administrator/components/com_admin/postinstall/addnosniff.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in the default .htaccess and web.config files.
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Notifies users of the add the nosniff headers by applying the changes from the default .htaccess or web.config file
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   3.4
+ */
+function admin_postinstall_addnosniff_condition()
+{
+	return true;
+}

administrator/components/com_admin/sql/updates/mysql/3.9.3-2019-02-07.sql

@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'COM_CPANEL_MSG_ADDNOSNIFF_TITLE', 'COM_CPANEL_MSG_ADDNOSNIFF_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/addnosniff.php', 'admin_postinstall_addnosniff_condition', '3.9.3', 1);

administrator/components/com_admin/sql/updates/postgresql/3.9.3-2019-02-07.sql

@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'COM_CPANEL_MSG_ADDNOSNIFF_TITLE', 'COM_CPANEL_MSG_ADDNOSNIFF_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/addnosniff.php', 'admin_postinstall_addnosniff_condition', '3.9.3', 1);

administrator/components/com_admin/sql/updates/sqlazure/3.9.3-2019-02-07.sql

@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_ADDNOSNIFF_TITLE', 'COM_CPANEL_MSG_ADDNOSNIFF_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/addnosniff.php', 'admin_postinstall_addnosniff_condition', '3.9.3', 1;

administrator/components/com_banners/models/forms/banner.xml

@@ -122,6 +122,7 @@
 			label="COM_BANNERS_FIELD_CLICKURL_LABEL"
 			description="COM_BANNERS_FIELD_CLICKURL_DESC"
 			filter="url"
+			validate="url"
 		/>
 	</fieldset>
 

administrator/components/com_categories/models/forms/category.xml

@@ -186,11 +186,12 @@
 
 	<field
 		name="created_time"
-		type="text"
+		type="calendar"
 		label="JGLOBAL_CREATED_DATE"
-		class="readonly"
-		filter="unset"
-		readonly="true"
+		translateformat="true"
+		showtime="true"
+		size="22"
+		filter="user_utc"
 	/>
 
 	<field
@@ -204,11 +205,14 @@
 
 	<field
 		name="modified_time"
-		type="text"
+		type="calendar"
 		label="JGLOBAL_FIELD_MODIFIED_LABEL"
 		class="readonly"
-		filter="unset"
+		translateformat="true"
+		showtime="true"
+		size="22"
 		readonly="true"
+		filter="user_utc"
 	/>
 
 	<field
@@ -261,7 +265,7 @@
 				description="COM_CATEGORIES_FIELD_IMAGE_DESC"
 			/>
 
-			<field 
+			<field
 				name="image_alt"
 				type="text"
 				label="COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL"

administrator/components/com_config/model/field/filters.php

@@ -35,6 +35,48 @@ class JFormFieldFilters extends JFormField
 	 */
 	protected function getInput()
 	{
+		// Load Framework
+		JHtml::_('jquery.framework');
+
+		// Add translation string for notification
+		JText::script('COM_CONFIG_TEXT_FILTERS_NOTE');
+
+		// Add Javascript
+		$doc = JFactory::getDocument();
+		$doc->addScriptDeclaration('
+			jQuery( document ).ready(function( $ ) {
+				$("#filter-config select").change(function() {
+					var currentFilter = $(this).children("option:selected").val();
+
+					if($(this).children("option:selected").val() === "NONE") {
+						var child = $("#filter-config select[data-parent=" + $(this).attr("data-id") + "]");
+					
+						while(child.length !== 0) {
+							if(child.children("option:selected").val() !== "NONE") {
+								alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE"));
+								break;
+							}
+							
+							child = $("#filter-config select[data-parent=" + child.attr("data-id") + "]");
+						}
+						
+						return;
+					}
+
+					var parent = $("#filter-config select[data-id=" + $(this).attr("data-parent") + "]");
+
+					while(parent.length !== 0) {
+						if(parent.children("option:selected").val() === "NONE") {
+							alert(Joomla.JText._("COM_CONFIG_TEXT_FILTERS_NOTE"));
+							break;
+						}
+						
+						parent = $("#filter-config select[data-id=" + parent.attr("data-parent") + "]")
+					}
+				});
+			});
+		');
+
 		// Get the available user groups.
 		$groups = $this->getUserGroups();
 
@@ -85,6 +127,8 @@ protected function getInput()
 			$html[] = '				<select'
 				. ' name="' . $this->name . '[' . $group->value . '][filter_type]"'
 				. ' id="' . $this->id . $group->value . '_filter_type"'
+				. ' data-parent="' . ($group->parent) . '" '
+				. ' data-id="' . ($group->value) . '" '
 				. ' class="novalidate"'
 				. '>';
 			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>'
@@ -147,7 +191,7 @@ protected function getUserGroups()
 
 		// Get the user groups from the database.
 		$query = $db->getQuery(true);
-		$query->select('a.id AS value, a.title AS text, COUNT(DISTINCT b.id) AS level');
+		$query->select('a.id AS value, a.title AS text, COUNT(DISTINCT b.id) AS level, a.parent_id as parent');
 		$query->from('#__usergroups AS a');
 		$query->join('LEFT', '#__usergroups AS b on a.lft > b.lft AND a.rgt < b.rgt');
 		$query->group('a.id, a.title, a.lft');

administrator/components/com_config/model/form/application.xml

@@ -1200,6 +1200,7 @@
 			label="COM_CONFIG_FIELD_HELP_SERVER_LABEL"
 			description="COM_CONFIG_FIELD_HELP_SERVER_DESC"
 			showDefault="false"
+			validate="options"
 		/>
 
 	</fieldset>

administrator/components/com_contact/config.xml

@@ -1031,6 +1031,12 @@
 		description="COM_CONTACT_CONFIG_INTEGRATION_SETTINGS_DESC"
 		>
 
+		<field
+			name="integration_newsfeeds"
+			type="note"
+			label="JGLOBAL_FEED_TITLE"
+		/>
+
 		<field
 			name="show_feed_link"
 			type="radio"
@@ -1043,6 +1049,12 @@
 			<option value="0">JHIDE</option>
 		</field>
 
+		<field
+			name="integration_sef"
+			type="note"
+			label="JGLOBAL_SEF_TITLE"
+		/>
+
 		<field
 			name="sef_advanced"
 			type="radio"
@@ -1070,6 +1082,12 @@
 			<option value="0">JNO</option>
 		</field>
 
+		<field
+			name="integration_customfields"
+			type="note"
+			label="JGLOBAL_FIELDS_TITLE"
+		/>
+
 		<field
 			name="custom_fields_enable"
 			type="radio"

administrator/components/com_contact/models/forms/contact.xml

@@ -401,6 +401,7 @@
 			description="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC"
 			size="30"
 			filter="url"
+			validate="url"
 		/>
 
 		<field
@@ -747,7 +748,7 @@
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
+
 			<field
 				name="show_user_custom_fields"
 				type="fieldgroups"
@@ -786,6 +787,7 @@
 				description="COM_CONTACT_FIELD_LINKA_DESC"
 				size="30"
 				filter="url"
+				validate="url"
 			/>
 
 			<field
@@ -803,6 +805,7 @@
 				description="COM_CONTACT_FIELD_LINKB_DESC"
 				size="30"
 				filter="url"
+				validate="url"
 			/>
 
 			<field
@@ -820,6 +823,7 @@
 				description="COM_CONTACT_FIELD_LINKC_DESC"
 				size="30"
 				filter="url"
+				validate="url"
 			/>
 
 			<field
@@ -837,6 +841,7 @@
 				description="COM_CONTACT_FIELD_LINKD_DESC"
 				size="30"
 				filter="url"
+				validate="url"
 			/>
 
 			<field
@@ -854,6 +859,7 @@
 				description="COM_CONTACT_FIELD_LINKE_DESC"
 				size="30"
 				filter="url"
+				validate="url"
 			/>
 
 			<field
@@ -893,33 +899,6 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field
-				name="banned_email"
-				type="textarea"
-				label="COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_LABEL"
-				description="COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC"
-				rows="3"
-				cols="30"
-			/>
-
-			<field
-				name="banned_subject"
-				type="textarea"
-				label="COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_LABEL"
-				description="COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_DESC"
-				rows="3"
-				cols="30"
-			/>
-
-			<field
-				name="banned_text"
-				type="textarea"
-				label="COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL"
-				description="COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC"
-				rows="3"
-				cols="30"
-			/>
-
 			<field
 				name="validate_session"
 				type="list"