Merge branch '4.0-dev' into noresults_round1

.eslintrc

@@ -0,0 +1,10 @@
+{
+	"extends": "airbnb-base",
+	"parser": "babel-eslint",
+	"env": {
+		"browser": true
+	},
+	"rules": {
+		"class-methods-use-this": "off"
+	}
+}

.gitignore

@@ -54,9 +54,6 @@ phpdoc-*
 /components/com_patchtester
 /media/com_patchtester
 
-# Install from Web plugin #
-/plugins/installer/webinstaller
-
 # Languages #
 administrator/language/*
 !administrator/language/en-GB

administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql

@@ -0,0 +1,6 @@
+INSERT INTO `#__extensions` (`extension_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
+(487, 'plg_system_httpheader', 'plugin', 'httpheader', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+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
+(NULL, 487, 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheader', 1, 'action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_condition', '4.0.0', 1);

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql

@@ -0,0 +1,6 @@
+INSERT INTO "#__extensions" ("extension_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
+(487, 'plg_system_httpheader', 'plugin', 'httpheader', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+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
+(NULL, 487, 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheader', 1, 'action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_condition', '4.0.0', 1);

administrator/components/com_associations/access.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <access component="com_associations">
 	<section name="component">
-		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
-		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
-		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.admin" title="JACTION_ADMIN" />
+		<action name="core.options" title="JACTION_OPTIONS" />
+		<action name="core.manage" title="JACTION_MANAGE" />
 	</section>
 </access>

administrator/components/com_banners/Model/TracksModel.php

@@ -484,7 +484,7 @@ public function getContent()
 
 			if ($this->getState('compressed'))
 			{
-				$app = \JFactory::getApplication('administrator');
+				$app = \JFactory::getApplication();
 
 				$files = array(
 					'track' => array(

administrator/components/com_banners/View/Banners/HtmlView.php

@@ -53,7 +53,7 @@ class HtmlView extends BaseHtmlView
 	 *
 	 * @param   string  $tpl  A template file to load. [optional]
 	 *
-	 * @return  mixed  A string if successful, otherwise a \JError object.
+	 * @return  mixed  A string if successful, otherwise an \Exception object.
 	 *
 	 * @since   1.6
 	 */

administrator/components/com_banners/access.xml

@@ -3,69 +3,58 @@
 	<section name="component">
 		<action
 			name="core.admin"
-			description="JACTION_ADMIN_COMPONENT_DESC"
 			title="JACTION_ADMIN"
 		/>
 
 		<action
 			name="core.options"
-			description="JACTION_OPTIONS_COMPONENT_DESC"
 			title="JACTION_OPTIONS"
 		/>
 
 		<action
 			name="core.manage"
-			description="JACTION_MANAGE_COMPONENT_DESC"
 			title="JACTION_MANAGE"
 		/>
 
 		<action
 			name="core.create"
-			description="JACTION_CREATE_COMPONENT_DESC"
 			title="JACTION_CREATE"
 		/>
 
 		<action
 			name="core.delete"
-			description="JACTION_DELETE_COMPONENT_DESC"
 			title="JACTION_DELETE"
 		/>
 
 		<action
 			name="core.edit"
-			description="JACTION_EDIT_COMPONENT_DESC"
 			title="JACTION_EDIT"
 		/>
 
 		<action
 			name="core.edit.state"
-			description="JACTION_EDITSTATE_COMPONENT_DESC"
 			title="JACTION_EDITSTATE"
 		/>
 
 	</section>
 	<section name="category">
 		<action
 			name="core.create"
-			description="COM_CATEGORIES_ACCESS_CREATE_DESC"
 			title="JACTION_CREATE"
 		/>
 
 		<action
 			name="core.delete"
-			description="COM_CATEGORIES_ACCESS_DELETE_DESC"
 			title="JACTION_DELETE"
 		/>
 
 		<action
 			name="core.edit"
-			description="COM_CATEGORIES_ACCESS_EDIT_DESC"
 			title="JACTION_EDIT"
 		/>
 
 		<action
 			name="core.edit.state"
-			description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC"
 			title="JACTION_EDITSTATE"
 		/>
 	</section>

administrator/components/com_banners/dispatcher.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_banners
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_cache/config.xml

@@ -16,11 +16,11 @@
 			<action
 				name="core.admin"
 				title="JACTION_ADMIN"
-				description="JACTION_MANAGE_COMPONENT_DESC" />
+				/>
 			<action
 				name="core.manage"
 				title="JACTION_MANAGE"
-				description="JACTION_MANAGE_COMPONENT_DESC" />
+				/>
 		</field>
 	</fieldset>
 </config>

administrator/components/com_cache/dispatcher.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_cache
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_categories/Model/CategoryModel.php

@@ -148,7 +148,7 @@ public function getTable($type = 'Category', $prefix = 'Administrator', $config
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('category.parent_id', $parentId);

administrator/components/com_categories/dispatcher.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_categories
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_categories/forms/category.xml

@@ -125,7 +125,6 @@
 		name="buttonspacer"
 		type="spacer"
 		label="JGLOBAL_ACTION_PERMISSIONS_LABEL"
-		description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
 	/>
 
 	<field

administrator/components/com_checkin/config.xml

@@ -17,11 +17,11 @@
 			<action
 				name="core.admin"
 				title="JACTION_ADMIN"
-				description="JACTION_ADMIN_COMPONENT_DESC" />
+				/>
 			<action
 				name="core.manage"
 				title="JACTION_MANAGE"
-				description="JACTION_MANAGE_COMPONENT_DESC" />
+				/>
 		</field>
 	</fieldset>
 </config>

administrator/components/com_config/Controller/ApplicationController.php

@@ -15,6 +15,7 @@
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Response\JsonResponse;
+use Joomla\CMS\Session\Session;
 
 /**
  * Controller for global configuration
@@ -208,7 +209,7 @@ public function sendtestmail()
 		$this->app->sendHeaders();
 
 		// Check if user token is valid.
-		if (!\JSession::checkToken('get'))
+		if (!Session::checkToken('get'))
 		{
 			$this->app->enqueueMessage(\JText::_('JINVALID_TOKEN'), 'error');
 			echo new JsonResponse;

administrator/components/com_config/Controller/DisplayController.php

@@ -11,7 +11,7 @@
 
 defined('_JEXEC') or die;
 
-use \Joomla\CMS\MVC\Controller\BaseController as BaseController;
+use Joomla\CMS\MVC\Controller\BaseController as BaseController;
 
 /**
  * Controller for global configuration

administrator/components/com_config/Model/ApplicationModel.php

@@ -881,7 +881,7 @@ public function sendTestMail()
 	{
 		// Set the new values to test with the current settings
 		$app = \JFactory::getApplication();
-		$input = $app->input;
+		$input = $app->input->json;
 
 		$app->set('smtpauth', $input->get('smtpauth'));
 		$app->set('smtpuser', $input->get('smtpuser', '', 'STRING'));

administrator/components/com_config/Model/ComponentModel.php

@@ -14,7 +14,7 @@
 use Joomla\CMS\Access\Access as JAccess;
 use Joomla\CMS\Access\Rules as JAccessRules;
 use Joomla\CMS\Component\ComponentHelper;
-use \Joomla\CMS\MVC\Model\FormModel;
+use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 

administrator/components/com_config/access.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <access component="com_config">
 	<section name="component">
-		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.admin" title="JACTION_ADMIN" />
 	</section>
 </access>

administrator/components/com_config/dispatcher.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_config
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

administrator/components/com_config/forms/application.xml

@@ -1166,62 +1166,50 @@
 			<action
 				name="core.login.site"
 				title="JACTION_LOGIN_SITE"
-				description="COM_CONFIG_ACTION_LOGIN_SITE_DESC"
 			/>
 			<action
 				name="core.login.admin"
 				title="JACTION_LOGIN_ADMIN"
-				description="COM_CONFIG_ACTION_LOGIN_ADMIN_DESC"
 			/>
 			<action
 				name="core.login.offline"
 				title="JACTION_LOGIN_OFFLINE"
-				description="COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC"
 			/>
 			<action
 				name="core.admin"
 				title="JACTION_ADMIN_GLOBAL"
-				description="COM_CONFIG_ACTION_ADMIN_DESC"
 			/>
 			<action
 				name="core.options"
 				title="JACTION_OPTIONS"
-				description="COM_CONFIG_ACTION_OPTIONS_DESC"
 			/>
 			<action
 				name="core.manage"
 				title="JACTION_MANAGE"
-				description="COM_CONFIG_ACTION_MANAGE_DESC"
 			/>
 			<action
 				name="core.create"
 				title="JACTION_CREATE"
-				description="COM_CONFIG_ACTION_CREATE_DESC"
 			/>
 			<action
 				name="core.delete"
 				title="JACTION_DELETE"
-				description="COM_CONFIG_ACTION_DELETE_DESC"
 			/>
 			<action
 				name="core.edit"
 				title="JACTION_EDIT"
-				description="COM_CONFIG_ACTION_EDIT_DESC"
 			/>
 			<action
 				name="core.edit.state"
 				title="JACTION_EDITSTATE"
-				description="COM_CONFIG_ACTION_EDITSTATE_DESC"
 			/>
 			<action
 				name="core.edit.own"
 				title="JACTION_EDITOWN"
-				description="COM_CONFIG_ACTION_EDITOWN_DESC"
 			/>
 			<action
 				name="core.edit.value"
 				title="JACTION_EDITVALUE"
-				description="COM_CONFIG_ACTION_EDITVALUE_DESC"
 			/>
 		</field>