Merge branch 'staging' into labelTag

.drone.yml

@@ -27,7 +27,7 @@ pipeline:
       - echo $(date)
 
   analysis3x:
-    image: rips/rips-cli
+    image: rips/rips-cli:1.2.1
     secrets:  [rips_username, rips_password]
     when:
       branch: staging
@@ -36,10 +36,10 @@ pipeline:
       - export RIPS_USERNAME=$RIPS_USERNAME
       - export RIPS_PASSWORD=$RIPS_PASSWORD
       - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - rips-cli rips:scan:start -a 1 -t 1 -p $(pwd) -t 1 -R -k -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
   analysis4x:
-    image: rips/rips-cli
+    image: rips/rips-cli:1.2.1
     secrets:  [rips_username, rips_password]
     when:
       branch: 4.0-dev
@@ -48,7 +48,7 @@ pipeline:
       - export RIPS_USERNAME=$RIPS_USERNAME
       - export RIPS_PASSWORD=$RIPS_PASSWORD
       - if [ $DRONE_REPO_OWNER != 'joomla' ]; then echo "The analysis check only run on the main repos"; exit 0; fi
-      - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
+      - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -R -k -T $DRONE_REPO_OWNER-$DRONE_BRANCH ||  { echo "Please contact the security team at security@joomla.org"; exit 1; }
 
 branches:
   exclude: [ l10n_* ]

.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/javascript/*  @wilsonge @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
+karma.conf.js  @wilsonge @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
+media/*/js/*  @wilsonge

.gitignore

@@ -70,6 +70,13 @@ Desktop.ini
 # Extra files installed by Composer not needed in the CMS environment
 # This should only ignore files like unit testing or READMEs, production
 # code must remain to ensure all libraries properly function
+/libraries/vendor/brumann/polyfill-unserialize/.gitignore
+/libraries/vendor/brumann/polyfill-unserialize/.travis.yml
+/libraries/vendor/brumann/polyfill-unserialize/composer.json
+/libraries/vendor/brumann/polyfill-unserialize/LICENSE
+/libraries/vendor/brumann/polyfill-unserialize/phpunit.xml.dist
+/libraries/vendor/brumann/polyfill-unserialize/README.md
+/libraries/vendor/brumann/polyfill-unserialize/tests
 /libraries/vendor/google/recaptcha/examples
 /libraries/vendor/google/recaptcha/tests
 /libraries/vendor/google/recaptcha/.gitignore
@@ -193,6 +200,14 @@ 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/tests
+/libraries/vendor/typo3/phar-stream-wrapper/.gitattributes
+/libraries/vendor/typo3/phar-stream-wrapper/.gitignore
+/libraries/vendor/typo3/phar-stream-wrapper/.travis.yml
+/libraries/vendor/typo3/phar-stream-wrapper/composer.json
+/libraries/vendor/typo3/phar-stream-wrapper/LICENSE
+/libraries/vendor/typo3/phar-stream-wrapper/phpunit.xml
+/libraries/vendor/typo3/phar-stream-wrapper/README.md
 
 # System Test related files
 tests/codeception/acceptance.suite.yml

administrator/components/com_actionlogs/config.xml

@@ -29,7 +29,7 @@
 			label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
 			description="COM_ACTIONLOGS_LOG_EXTENSIONS_DESC"
 			multiple="true"
-			default="com_banners,com_cache,com_categories,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"
+			default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"
 		/>
 	</fieldset>
 </config>

administrator/components/com_actionlogs/controllers/actionlogs.php

@@ -121,7 +121,7 @@ public function exportLogs()
 			}
 
 			fclose($output);
-
+			$app->triggerEvent('onAfterLogExport', array());
 			$app->close();
 		}
 		else

administrator/components/com_actionlogs/helpers/actionlogs.php

@@ -193,6 +193,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)
@@ -208,7 +220,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_actionlogs/models/actionlogs.php

@@ -330,15 +330,17 @@ public function delete(&$pks)
 		try
 		{
 			$db->execute();
-
-			return true;
 		}
 		catch (RuntimeException $e)
 		{
 			$this->setError($e->getMessage());
 
 			return false;
 		}
+
+		Factory::getApplication()->triggerEvent('onAfterLogPurge', array());
+
+		return true;
 	}
 
 	/**
@@ -353,13 +355,15 @@ public function purge()
 		try
 		{
 			$this->getDbo()->truncateTable('#__action_logs');
-
-			return true;
 		}
 		catch (Exception $e)
 		{
 			return false;
 		}
+
+		Factory::getApplication()->triggerEvent('onAfterLogPurge', array());
+
+		return true;
 	}
 
 	/**

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.0-2018-05-02.sql

@@ -5,11 +5,11 @@ CREATE TABLE IF NOT EXISTS `#__privacy_requests` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `email` varchar(100) NOT NULL DEFAULT '',
   `requested_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `status` tinyint(4) NOT NULL DEFAULT '0',
+  `status` tinyint(4) NOT NULL DEFAULT 0,
   `request_type` varchar(25) NOT NULL DEFAULT '',
   `confirm_token` varchar(100) NOT NULL DEFAULT '',
   `confirm_token_created_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `checked_out` int(11) NOT NULL DEFAULT '0',
+  `checked_out` int(11) NOT NULL DEFAULT 0,
   `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
   KEY `idx_checkout` (`checked_out`)

administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql

@@ -3,11 +3,11 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 
 CREATE TABLE IF NOT EXISTS `#__privacy_consents` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `user_id` int(10) unsigned NOT NULL DEFAULT 0,
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `subject` varchar(255) NOT NULL DEFAULT '',
   `body` text NOT NULL,
-  `remind` tinyint(4) NOT NULL DEFAULT '0',
+  `remind` tinyint(4) NOT NULL DEFAULT 0,
   `token` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `idx_user_id` (`user_id`)

administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-08-12.sql

@@ -1 +1 @@
-ALTER TABLE `#__privacy_consents` ADD COLUMN `state` INT(10) NOT NULL DEFAULT '1' AFTER `user_id`;
+ALTER TABLE `#__privacy_consents` ADD COLUMN `state` INT(10) NOT NULL DEFAULT 1 AFTER `user_id`;

administrator/components/com_admin/sql/updates/mysql/3.9.3-2019-01-12.sql

@@ -0,0 +1,6 @@
+UPDATE `#__extensions` 
+SET `params` = REPLACE(`params`, '"com_categories",', '"com_categories","com_checkin",')
+WHERE `name` = 'com_actionlogs';
+
+INSERT INTO `#__action_logs_extensions` (`extension`) VALUES
+('com_checkin');

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-01-12.sql

@@ -0,0 +1,8 @@
+UPDATE "#__extensions" 
+SET "params" = REPLACE("params", '"com_categories",', '"com_categories","com_checkin",')
+WHERE "name" = 'com_actionlogs';
+
+INSERT INTO "#__action_logs_extensions" ("extension") VALUES
+('com_checkin');
+
+SELECT setval('#__action_logs_extensions_id_seq', max(id)) FROM "#__action_logs_extensions";

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.0-2018-05-02.sql

@@ -1,9 +1,9 @@
-SET IDENTITY_INSERT #__extensions  ON;
+SET IDENTITY_INSERT "#__extensions" ON;
 
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
 (35, 0, 'com_privacy', 'component', 'com_privacy', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
 
-SET IDENTITY_INSERT #__extensions  OFF;
+SET IDENTITY_INSERT "#__extensions" OFF;
 
 CREATE TABLE "#__privacy_requests" (
   "id" int IDENTITY(1,1) NOT NULL,

administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-05-03.sql

@@ -1,6 +1,6 @@
-SET IDENTITY_INSERT #__extensions  ON;
+SET IDENTITY_INSERT "#__extensions" ON;
 
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
 (482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0);
 
-SET IDENTITY_INSERT #__extensions  OFF;
+SET IDENTITY_INSERT "#__extensions" OFF;