Merge branch 'staging' of github.com:joomla/joomla-cms into review-co…

…ntent-component
joomla · Jul 20, 2016 · 2be7927 · 2be7927
2 parents 76a78d7 + a3ee16c
commit 2be7927
Show file tree

Hide file tree

Showing 513 changed files with 4,395 additions and 2,357 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # IDE & System Related Files #
 .buildpath
+.editorconfig
 .project
 .settings
 .DS_Store
@@ -118,6 +119,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

diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,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
@@ -39,6 +41,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:

diff --git a/administrator/components/com_admin/models/profile.php b/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.

diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
@@ -209,6 +209,7 @@ protected function cleanSectionPrivateData($sectionValues)
 			{
 				$sectionValues = 'xxxxxx';
 			}
+
 			return strlen($sectionValues) ? 'xxxxxx' : '';
 		}
 

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1423,6 +1423,7 @@ public function deleteUnexistingFiles()
 			'/administrator/manifests/libraries/simplepie.xml',
 			'/administrator/templates/isis/js/jquery.js',
 			'/administrator/templates/isis/js/bootstrap.min.js',
+			'/media/system/js/permissions.min.js',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

diff --git a/administrator/components/com_banners/controller.php b/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.

diff --git a/administrator/components/com_banners/models/forms/download.xml b/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>
diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/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"

diff --git a/administrator/components/com_banners/models/forms/filter_tracks.xml b/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"

diff --git a/administrator/components/com_banners/views/banner/view.html.php b/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);
 			}

diff --git a/administrator/components/com_banners/views/banners/view.html.php b/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();

diff --git a/administrator/components/com_banners/views/client/view.html.php b/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);
 			}

diff --git a/administrator/components/com_banners/views/clients/view.html.php b/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.

diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/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>
diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/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'); ?>

diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/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 tracks.
@@ -66,8 +66,6 @@ public function display($tpl = null)
 
 		$this->addToolbar();
 
-		require_once JPATH_COMPONENT . '/models/fields/bannerclient.php';
-
 		$this->sidebar = JHtmlSidebar::render();
 
 		return parent::display($tpl);
@@ -87,7 +85,19 @@ protected function addToolbar()
 		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'bookmark banners-tracks');
 
 		$bar = JToolbar::getInstance('toolbar');
-		$bar->appendButton('Popup', 'download', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
+
+		// Instantiate a new JLayoutFile instance and render the export button
+		$layout = new JLayoutFile('joomla.toolbar.modal');
+
+		$dhtml  = $layout->render(
+			array(
+				'selector' => 'downloadModal',
+				'icon'     => 'download',
+				'text'     => JText::_('JTOOLBAR_EXPORT'),
+			)
+		);
+
+		$bar->appendButton('Custom', $dhtml, 'download');
 
 		if ($canDo->get('core.delete'))
 		{

diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php
@@ -28,7 +28,7 @@ class CacheController extends JControllerLegacy
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT . '/helpers/cache.php';
+		JLoader::register('CacheHelper', JPATH_ADMINISTRATOR . '/components/com_cache/helpers/cache.php');
 
 		// Get the document object.
 		$document = JFactory::getDocument();
@@ -93,6 +93,7 @@ public function delete()
 				JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_DELETED'), 'message');
 			}
 		}
+
 		$this->setRedirect('index.php?option=com_cache');
 	}
 
@@ -152,6 +153,7 @@ public function purge()
 		{
 			JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED'), 'message');
 		}
+
 		$this->setRedirect('index.php?option=com_cache&view=purge');
 	}
 }
diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php
@@ -196,7 +196,7 @@ public function getClient()
 	/**
 	 * Get the number of current Cache Groups.
 	 *
-	 * @return  int
+	 * @return  integer
 	 */
 	public function getTotal()
 	{

diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php
@@ -89,7 +89,7 @@ public function display($cachable = false, $urlparams = array())
 			$view->document = $document;
 
 			// Load the submenu.
-			require_once JPATH_COMPONENT . '/helpers/categories.php';
+			JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
 
 			CategoriesHelper::addSubmenu($model->getState('filter.extension'));
 			$view->display();

diff --git a/administrator/components/com_categories/tables/category.php b/administrator/components/com_categories/tables/category.php
@@ -24,7 +24,6 @@ class CategoriesTableCategory extends JTableCategory
 	 *
 	 * @return  boolean  True on success.
 	 *
-	 * @see     https://docs.joomla.org/JTableNested/delete
 	 * @since   2.5
 	 */
 	public function delete($pk = null, $children = false)

diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php
@@ -16,7 +16,7 @@
 	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
 }
 
-require_once JPATH_ROOT . '/components/com_content/helpers/route.php';
+JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php');
 
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');

diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php
@@ -163,7 +163,7 @@ protected function addToolbar()
 		|| $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true);
 
 		// Load the category helper.
-		require_once JPATH_COMPONENT . '/helpers/categories.php';
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
 
 		// If a component categories title string is present, let's use it.
 		if ($lang->hasKey($component_title_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_TITLE'))

diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -68,6 +68,8 @@
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CATEGORIES_FIELDSET_PUBLISHING')); ?>
 		<div class="row-fluid form-horizontal-desktop">
 			<div class="span6">
@@ -93,8 +95,6 @@
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
-		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
-
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 
 		<?php echo $this->form->getInput('extension'); ?>