Merge remote-tracking branch 'joomla/staging' into develop

.gitignore

@@ -1,5 +1,6 @@
 # IDE & System Related Files #
 .buildpath
+.editorconfig
 .project
 .settings
 .DS_Store
@@ -121,6 +122,8 @@ Desktop.ini
 /libraries/vendor/psr/log/.gitignore
 /libraries/vendor/psr/log/composer.json
 /libraries/vendor/psr/log/README.md
+/libraries/vendor/symfony/polyfill-php55/composer.json
+/libraries/vendor/symfony/polyfill-php55/README.md
 /libraries/vendor/symfony/polyfill-php56/composer.json
 /libraries/vendor/symfony/polyfill-php56/README.md
 /libraries/vendor/symfony/polyfill-util/composer.json

.travis.yml

@@ -20,6 +20,8 @@ matrix:
       env: RUN_PHPCS="yes" INSTALL_APCU="yes"
     - php: 7.0
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - php: 7.1
+      env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
     - php: hhvm
       sudo: true
       dist: trusty
@@ -36,6 +38,7 @@ matrix:
         - redis-server
       env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" # Disabled items that currently do not work in travis-ci hhvm
   allow_failures:
+    - php: 7.1
     - php: hhvm
 
 services:

README.md

@@ -16,14 +16,6 @@ What is this?
 * The `tests\javascript` directory contains all those JavaScript tests.
 * The tests are written using the Jasmine framework and Karma is used as the test runner.
 
-Before you can run the tests, you need to install some programs on your local workstation, as documented below.
-
-Prerequisites
----------------------
-* The testing environment requires your local machine to have Node.js installed in it.
-* To install node.js, please go to the node.js [official website](https://nodejs.org/en/), download the respective setup for your operating system and install it by following the installation wizard.
-* The current testing setup uses Firefox as the browser to run the tests. Please make sure You have Firefox installed in you local machine.
-
 Install dependencies
 ---------------------
 1. Open a command line and navigate to the directory `tests/javascript`

README.txt

@@ -6,38 +6,40 @@
 
 2- What is Joomla?
 	* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
-	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later
-	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
-	More details here: https://www.joomla.org/about-joomla.html
+	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later.
+	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run.
+	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
 
-3- Is Joomla for you?
-	* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
-	* See Features - https://www.joomla.org/core-features.html
+3- Is Joomla! for you?
+	* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+	* See Joomla's core features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: http://community.joomla.org/translations.html
-	* You can also add languages directly to your website via your Joomla! administration panel.
+	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language
+	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site
 
 5- Learn Joomla!
 	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!
-	* Before installing, read the beginners guide: https://docs.joomla.org/Beginners
+	* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
 
-6- What are the limits of Joomla?
-	* Joomla sites can be extended in functionalities with Extensions that you can create (or download) to suite your needs.
-	* There are lots of ready made extensions that you can download and install.
-	* See the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+6- What are the benefits of Joomla?
+	* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* There are many ready-made extensions that you can download and install.
+	* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
 
 7- Is it easy to change the layout display?
 	* The layout is controlled by templates that you can edit.
-	* There are lots of ready made templates that you can download.
+	* There are a lot of ready-made professional templates that you can download.
+	* Check out the template management information: https://docs.joomla.org/Portal:Template_Management
 
 8- Ready to install Joomla?
-	* See minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
-	* How do you install Joomla! ? - https://docs.joomla.org/Installing_Joomla!
-	* Start your Joomla experience building your site with a local test server.
+	* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
+	* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
+	* You could start your Joomla! experience building your site on a local test server.
 	When ready it can be moved to an on-line hosting account of your choice.
-	See the tutorial: https://docs.joomla.org/Tutorial:Joomla_Local_install
+	See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
 
 9- Updates are free!
 	* Always use the latest version: https://www.joomla.org/download.html
@@ -48,21 +50,20 @@
 	* Find the information you need: https://docs.joomla.org/Start_here
 	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
 	* Post questions at our forums: http://forum.joomla.org
-	* Joomla Resources Directory (JRD): http://resources.joomla.org/
+	* Joomla! Resources Directory (JRD): http://resources.joomla.org/
 
-11- Do you already have a Joomla site that's not built with Joomla 3.x ?
-	* What's new in Joomla 3.x: https://www.joomla.org/3
-	* What are the main differences from 2.5 to 3? Table of contents: https://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
+11- Do you already have a Joomla! site that's not built with Joomla! 3.x ?
+	* What's new in Joomla! 3.x: https://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F
 	* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration
-	* Convert an existing Web site to Joomla: https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
 
 12- Do you want to improve Joomla?
-	* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
+	* Where to request a feature? https://issues.joomla.org/
 	* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
 	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
-	* Are you a Developer? https://docs.joomla.org/Developers
-	* Are you a Web designer? https://docs.joomla.org/Web_designers
+	* Documentation for Developers: https://docs.joomla.org/Portal:Developers
+	* Documentation for Web designers: https://docs.joomla.org/Web_designers
 
 Copyright:
 	* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.

administrator/components/com_admin/models/profile.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-require_once JPATH_ADMINISTRATOR . '/components/com_users/models/user.php';
+JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php');
 
 /**
  * User model.

administrator/components/com_admin/models/sysinfo.php

@@ -209,6 +209,7 @@ protected function cleanSectionPrivateData($sectionValues)
 			{
 				$sectionValues = 'xxxxxx';
 			}
+
 			return strlen($sectionValues) ? 'xxxxxx' : '';
 		}
 

administrator/components/com_admin/script.php

@@ -31,6 +31,8 @@ public function update($installer)
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
 		JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');
 
+		// This needs to stay for 2.5 update compatibility
+		$this->deleteUnexistingFiles();
 		$this->updateManifestCaches();
 		$this->updateDatabase();
 		$this->clearRadCache();

administrator/components/com_banners/controller.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php');
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
 
 /**
  * Banners master display controller.

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

@@ -169,6 +169,7 @@
 			name="modified_by"
 			type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_BANNERS_FIELD_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"

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

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
+
 	<fieldset name="details">
+
 		<field
 			name="compressed"
 			type="radio"
 			label="COM_BANNERS_FIELD_COMPRESSED_LABEL"
 			description="COM_BANNERS_FIELD_COMPRESSED_DESC"
-			class="btn-group btn-group-yesno"
 			default="0"
+			class="btn-group btn-group-yesno"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -16,9 +18,15 @@
 		<field
 			name="basename"
 			type="text"
+			size="40"
 			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+		/>
+
+		<field
+			name="basename_info"
+			type="note"
 			description="COM_BANNERS_FIELD_BASENAME_DESC"
-			size="40"
+			class="alert alert-info"
 		/>
 	</fieldset>
 </form>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fields name="filter">
+	<fields name="filter" addfieldpath="/administrator/components/com_banners/models/fields">
 		<field
 			name="search"
 			type="text"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fields name="filter">
+	<fields name="filter" addfieldpath="/administrator/components/com_banners/models/fields">
 		<field
 			name="search"
 			type="text"

administrator/components/com_banners/views/banner/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php');
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
 
 /**
  * View to edit a banner.
@@ -112,7 +112,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.banner', $this->item->id);
 			}

administrator/components/com_banners/views/banners/view.html.php

@@ -73,7 +73,6 @@ public function display($tpl = null)
 		BannersHelper::addSubmenu('banners');
 
 		$this->addToolbar();
-		require_once JPATH_COMPONENT . '/models/fields/bannerclient.php';
 
 		// Include the component HTML helpers.
 		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
@@ -92,7 +91,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT . '/helpers/banners.php';
+		JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
 
 		$canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
 		$user  = JFactory::getUser();

administrator/components/com_banners/views/client/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php');
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
 
 /**
  * View to edit a client.
@@ -105,6 +105,7 @@ protected function addToolbar()
 		{
 			JToolbarHelper::save2new('client.save2new');
 		}
+
 		// If an existing item, can save to a copy.
 		if (!$isNew && $canDo->get('core.create'))
 		{
@@ -117,7 +118,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.client', $this->item->id);
 			}

administrator/components/com_banners/views/clients/view.html.php

@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php');
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
 
 /**
  * View class for a list of clients.

administrator/components/com_banners/views/download/tmpl/default.php

@@ -8,25 +8,30 @@
  */
 
 defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
 ?>
-<form
-	action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
-	method="post"
-	name="adminForm"
-	id="download-form"
-	class="form-validate">
-	<fieldset class="adminform">
-		<legend><?php echo JText::_('COM_BANNERS_TRACKS_DOWNLOAD'); ?></legend>
+<div class="container-popup">
+	<form
+		class="form-horizontal form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		method="post">
 
 		<?php foreach ($this->form->getFieldset() as $field) : ?>
-			<?php if (!$field->hidden) : ?>
-				<?php echo $field->label; ?>
-			<?php endif; ?>
-			<?php echo $field->input; ?>
+			<?php echo $this->form->renderField($field->fieldname); ?>
 		<?php endforeach; ?>
-		<div class="clr"></div>
-		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#modal-download\').modal(\'hide\')', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
-		<button type="button" class="btn" onclick="window.parent.jQuery('#modal-download').modal('hide');"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>
 
-	</fieldset>
-</form>
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>

administrator/components/com_banners/views/tracks/tmpl/default.php

@@ -83,6 +83,26 @@
 				</tbody>
 			</table>
 		<?php endif; ?>
+
+		<?php // Load the export form ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'downloadModal',
+			array(
+				'title'       => JText::_('COM_BANNERS_TRACKS_DOWNLOAD'),
+				'url'         => JRoute::_('index.php?option=com_banners&amp;view=download&amp;tmpl=component'),
+				'height'      => '370px',
+				'width'       => '300px',
+				'modalWidth'  => '40',
+				'footer'      => '<button class="btn" data-dismiss="modal" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_("COM_BANNERS_CANCEL") . '</button>'
+						. '<button class="btn btn-success" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+						. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
+			)
+		); ?>
+
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
 		<?php echo JHtml::_('form.token'); ?>