Merge branch 'staging' into jroute-between-sites

* staging: (148 commits)
  Correcting non-escaped double quotes in en-GB.plg_sampledata_testing.ini (joomla#17455)
  Correct namespace reference (Fix joomla#17448)
  Correcting Jalali/Persian calendar popup (joomla#17432)
  Adding russian calendar language file (joomla#17443)
  Reset for dev
  Prepare 3.8 Beta release
  Fix covers tags
  Fix file paths
  Move library files to just libraries/src as it should be (joomla#17441)
  Add a default empty array for the session queue (joomla#16943)
  [3.8] Restructure version constants (joomla#16169)
  Adjusting copyright and versions and two remaining "sampledata" (joomla#17435)
  PHP 7.2 has branched, update Travis config to reflect
  PHP 7.2 count warning (joomla#16840)
  Enforce array for subform values (joomla#16733)
  System URL menu link (joomla#17419)
  Don't use array merge here. (joomla#17391)
  add the checked attribute (joomla#17336)
  [RFC] Mod sample data (joomla#7680)
  Rename Page to Menu Item (joomla#17409)
  ...

.gitignore

@@ -12,6 +12,7 @@
 /administrator/logs
 /cache
 /installation/cache
+/libraries/autoload_psr4.php
 /tmp
 /configuration.php
 /.htaccess
@@ -116,6 +117,12 @@ Desktop.ini
 /libraries/vendor/paragonie/random_compat/psalm-autoload.php
 /libraries/vendor/paragonie/random_compat/psalm.xml
 /libraries/vendor/paragonie/random_compat/tests
+/libraries/vendor/paragonie/sodium_compat/.gitignore
+/libraries/vendor/paragonie/sodium_compat/composer.json
+/libraries/vendor/paragonie/sodium_compat/composer.lock
+/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
+/libraries/vendor/paragonie/sodium_compat/README.md
+/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
 /libraries/vendor/phpmailer/phpmailer/docs
 /libraries/vendor/phpmailer/phpmailer/examples
 /libraries/vendor/phpmailer/phpmailer/language

.travis.yml

@@ -17,17 +17,24 @@ matrix:
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: 7.1
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
+    # Requires older Precise image
     - php: 5.3
       env: INSTALL_APC="yes"
+      sudo: true
+      dist: precise
+    # The new Trusty image has issues with running APC, do not enable it here
     - php: 5.4
-      env: INSTALL_APC="yes"
+      env: INSTALL_APC="no"
     - php: 5.5
       env: INSTALL_APCU="yes"
     - php: 5.6
       env: INSTALL_APCU="yes"
+    - php: 7.2
+      env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
     - php: nightly
       env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
   allow_failures:
+    - php: 7.2
     - php: nightly
 
 services:

README.md

@@ -15,8 +15,8 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.7 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
+* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).
 
 What is Joomla?
 ---------------------

README.txt

@@ -1,8 +1,8 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.7 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
+	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.

administrator/components/com_admin/script.php

@@ -1769,8 +1769,43 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/crypt/password.php',
 			'/libraries/joomla/crypt/password/simple.php',
 			'/libraries/joomla/date/date.php',
+			'/libraries/joomla/document/document.php',
+			'/libraries/joomla/document/error.php',
+			'/libraries/joomla/document/feed.php',
+			'/libraries/joomla/document/feed/renderer/atom.php',
+			'/libraries/joomla/document/feed/renderer/rss.php',
+			'/libraries/joomla/document/html.php',
+			'/libraries/joomla/document/html/renderer/component.php',
+			'/libraries/joomla/document/html/renderer/head.php',
+			'/libraries/joomla/document/html/renderer/message.php',
+			'/libraries/joomla/document/html/renderer/module.php',
+			'/libraries/joomla/document/html/renderer/modules.php',
+			'/libraries/joomla/document/image.php',
+			'/libraries/joomla/document/json.php',
+			'/libraries/joomla/document/opensearch.php',
+			'/libraries/joomla/document/raw.php',
+			'/libraries/joomla/document/renderer.php',
+			'/libraries/joomla/document/renderer/feed/atom.php',
+			'/libraries/joomla/document/renderer/feed/rss.php',
+			'/libraries/joomla/document/renderer/html/component.php',
+			'/libraries/joomla/document/renderer/html/head.php',
+			'/libraries/joomla/document/renderer/html/message.php',
+			'/libraries/joomla/document/renderer/html/module.php',
+			'/libraries/joomla/document/renderer/html/modules.php',
+			'/libraries/joomla/document/xml.php',
 			'/libraries/joomla/environment/browser.php',
 			'/libraries/joomla/factory.php',
+			'/libraries/joomla/feed/entry.php',
+			'/libraries/joomla/feed/factory.php',
+			'/libraries/joomla/feed/feed.php',
+			'/libraries/joomla/feed/link.php',
+			'/libraries/joomla/feed/parser.php',
+			'/libraries/joomla/feed/parser/atom.php',
+			'/libraries/joomla/feed/parser/namespace.php',
+			'/libraries/joomla/feed/parser/rss.php',
+			'/libraries/joomla/feed/parser/rss/itunes.php',
+			'/libraries/joomla/feed/parser/rss/media.php',
+			'/libraries/joomla/feed/person.php',
 			'/libraries/joomla/filter/input.php',
 			'/libraries/joomla/filter/output.php',
 			'/libraries/joomla/filter/wrapper/output.php',
@@ -1872,6 +1907,8 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/view/legacy.php',
 			'/libraries/legacy/web/client.php',
 			'/libraries/legacy/web/web.php',
+			'/administrator/modules/mod_menu/preset/enabled.php',
+			'/administrator/modules/mod_menu/preset/disabled.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -2055,7 +2092,18 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/crypt/password',
 			'/libraries/joomla/crypt',
 			'/libraries/joomla/date',
+			'/libraries/joomla/document/feed/renderer',
+			'/libraries/joomla/document/feed',
+			'/libraries/joomla/document/html/renderer',
+			'/libraries/joomla/document/html',
+			'/libraries/joomla/document/renderer/feed',
+			'/libraries/joomla/document/renderer/html',
+			'/libraries/joomla/document/renderer',
+			'/libraries/joomla/document',
 			'/libraries/joomla/environment',
+			'/libraries/joomla/feed/parser/rss',
+			'/libraries/joomla/feed/parser',
+			'/libraries/joomla/feed',
 			'/libraries/joomla/filter/wrapper',
 			'/libraries/joomla/filter',
 			'/libraries/joomla/form/rule',
@@ -2083,6 +2131,7 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/model',
 			'/libraries/legacy/view',
 			'/libraries/legacy/web',
+			'/administrator/modules/mod_menu/preset',
 		);
 
 		jimport('joomla.filesystem.file');

administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__fields_groups` ADD `params` TEXT  NOT NULL  AFTER `ordering`;

administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql

@@ -0,0 +1,6 @@
+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
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);

administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql

@@ -0,0 +1 @@
+ALTER TABLE "#__fields_groups" ADD "params" TEXT NOT NULL ;

administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql

@@ -0,0 +1,6 @@
+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
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);

administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql

@@ -0,0 +1 @@
+ALTER TABLE [#__fields_groups] ADD [params] [text] NOT NULL DEFAULT '';

administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql

@@ -0,0 +1,5 @@
+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
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+  (480, 0, 'plg_sampledata_testing', 'plugin', 'testing', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);

administrator/components/com_admin/views/help/tmpl/langforum.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$forumId   = (int) JText::_('COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+$forum_url = 'https://forum.joomla.org/viewforum.php?f=' . $forumId;
+
+JFactory::getApplication()->redirect($forum_url);

administrator/components/com_categories/models/category.php

@@ -57,6 +57,9 @@ public function __construct($config = array())
 		parent::__construct($config);
 		$extension = JFactory::getApplication()->input->get('extension', 'com_content');
 		$this->typeAlias = $extension . '.category';
+
+		// Add a new batch command
+		$this->batch_commands['flip_ordering'] = 'batchFlipordering';
 	}
 
 	/**
@@ -819,6 +822,56 @@ protected function batchTag($value, $pks, $contexts)
 		return true;
 	}
 
+	/**
+	 * Batch flip category ordering.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed    An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   3.6.3
+	 */
+	protected function batchFlipordering($value, $pks, $contexts)
+	{
+		$successful = array();
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		/**
+		 * For each category get the max ordering value
+		 * Re-order with max - ordering
+		 */
+		foreach ($pks as $id)
+		{
+			$query->select('MAX(ordering)')
+				->from('#__content')
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			$max = (int) $db->loadresult();
+			$max++;
+
+			$query->clear();
+
+			$query->update('#__content')
+				->set($db->qn('ordering') . ' = ' . $max . ' - ' . $db->qn('ordering'))
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			if ($db->execute())
+			{
+				$successful[] = $id;
+			}
+		}
+
+		return empty($successful) ? false : $successful;
+	}
+
 	/**
 	 * Batch copy categories to a new category.
 	 *

administrator/components/com_categories/models/fields/categoryedit.php

@@ -242,6 +242,11 @@ protected function getOptions()
 			$db->setQuery($query);
 			$language = $db->loadResult();
 
+			if ($options[$i]->level != 0)
+			{
+				$options[$i]->level = $options[$i]->level -1;
+			}
+
 			if ($options[$i]->published == 1)
 			{
 				$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->text;

administrator/components/com_categories/models/fields/categoryparent.php

@@ -14,7 +14,8 @@
 /**
  * Category Parent field.
  *
- * @since  1.6
+ * @since       1.6
+ * @deprecated  4.0  Use categoryedit instead.
  */
 class JFormFieldCategoryParent extends JFormFieldList
 {

administrator/components/com_categories/views/categories/tmpl/default_batch_body.php

@@ -38,7 +38,7 @@
 					</label>
 					<div id="batch-choose-action" class="combo controls">
 						<select name="batch[category_id]" id="batch-category-id">
-							<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+							<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY') ?></option>
 							<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published))); ?>
 						</select>
 					</div>
@@ -55,4 +55,15 @@
 			</div>
 		</div>
 	</div>
+	<div class="row-fluid">
+		<div class="span6">
+			<div class="control-group">
+				<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
+					<?php echo JText::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
+				</label>
+				<?php echo JHtml::_('select.booleanlist', 'batch[flip_ordering]', array(), 0, 'JYES', 'JNO', 'flip-ordering-id'); ?>
+			</div>
+		</div>
+	</div>
 </div>
+

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

@@ -922,6 +922,31 @@
 			size="5"
 		/>
 
+		<field
+			name="session_redis_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="session_handler:redis"
+			size="25"
+		/>
+
+		<field
+			name="session_redis_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
+			showon="session_handler:redis"
+			min="1"
+			max="65535"
+			default="6379"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
 		<field
 			name="lifetime"
 			type="number"

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

@@ -12,4 +12,4 @@
 $this->name = JText::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
 $this->fieldsname = 'filters';
 $this->description = JText::_('COM_CONFIG_TEXT_FILTERS_DESC');
-echo JLayoutHelper::render('joomla.content.options_default', $this);
+echo JLayoutHelper::render('joomla.content.text_filters', $this);

administrator/components/com_config/view/application/tmpl/default_mail.php

@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+JHtml::_('jquery.token');
 JHtml::_('script', 'system/sendtestmail.js', array('version' => 'auto', 'relative' => true));
 
 // Load JavaScript message titles
@@ -25,7 +26,7 @@
 JText::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
 
 // Ajax request data.
-$ajaxUri = JRoute::_('index.php?option=com_config&task=config.sendtestmail.application&format=json&' . JSession::getFormToken() . '=1');
+$ajaxUri = JRoute::_('index.php?option=com_config&task=config.sendtestmail.application&format=json');
 
 $this->name = JText::_('COM_CONFIG_MAIL_SETTINGS');
 $this->fieldsname = 'mail';

administrator/components/com_content/config.xml

@@ -364,9 +364,10 @@
 
 		<field
 			name="urls_position"
-			type="list"
+			type="radio"
 			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
 			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+			class="btn-group btn-group-yesno"
 			default="0"
 			>
 			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>

administrator/components/com_content/models/forms/article.xml

@@ -1029,7 +1029,6 @@
 				type="textarea" 
 				label="JFIELD_META_RIGHTS_LABEL"
 				description="JFIELD_META_RIGHTS_DESC" 
-				required="false" 
 				filter="string"
 				cols="30" 
 				rows="2"