4.0 dev

.drone.yml

@@ -64,7 +64,7 @@ pipeline:
       - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
       - sleep 3
       - fluxbox  > /dev/null 2>&1 &
-      - cd /drone/src/github.com/joomla/joomla-cms && npm run lint:js
+      - npm run lint:js
 
   javascript-tests:
     image: joomlaprojects/docker-systemtests:develop

administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql

@@ -14,5 +14,5 @@ CREATE TABLE "#__privacy_requests" (
   "user_id" bigint DEFAULT 0 NOT NULL,
   PRIMARY KEY ("id")
 );
-CREATE INDEX "#__fields_idx_checked_out" ON "#__privacy_requests" ("checked_out");
-CREATE INDEX "#__fields_idx_user_id" ON "#__privacy_requests" ("user_id");
+CREATE INDEX "#__privacy_requests_idx_checked_out" ON "#__privacy_requests" ("checked_out");
+CREATE INDEX "#__privacy_requests_idx_user_id" ON "#__privacy_requests" ("user_id");

administrator/components/com_config/tmpl/application/default_ftplogin.php

@@ -7,11 +7,12 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+defined('_JEXEC') or die;
+
 use Joomla\CMS\Language\Text;
 
-defined('_JEXEC') or die;
 ?>
-<fieldset title="<?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?>">
+<fieldset>
 	<legend><?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
 	<?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
 	<?php if ($this->ftp instanceof Exception) : ?>

administrator/components/com_contact/tmpl/contact/edit.php

@@ -80,7 +80,8 @@
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'misc', Text::_('JGLOBAL_FIELDSET_MISCELLANEOUS')); ?>
 		<div class="row">
 			<div class="col-md-12">
-				<?php echo $this->form->renderField('misc'); ?>
+				<?php echo $this->form->getLabel('misc'); ?>
+				<?php echo $this->form->getInput('misc'); ?>
 			</div>
 		</div>
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>

administrator/components/com_contact/tmpl/contacts/default.php

@@ -61,6 +61,9 @@
 								<td style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
+								<th scope="col" style="width:1%" class="text-center">
+									<?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
+								</th>
 								<th scope="col" style="width:1%; min-width:85px" class="text-center">
 									<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 								</th>
@@ -124,12 +127,17 @@
 								<td class="text-center">
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
+								<td class="text-center">
+									<div class="btn-group">
+									        <?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
+								   	</div>
+								</td>	
 								<td class="text-center">
 									<div class="btn-group">
 										<?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
-										<?php echo HTMLHelper::_('contactadministrator.featured', $item->featured, $i, $canChange); ?>
-									</div>
+									</div>	
 								</td>
+
 								<th scope="row" class="has-context">
 									<div>
 										<?php if ($item->checked_out) : ?>

administrator/components/com_content/Model/ArticlesModel.php

@@ -107,6 +107,9 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
 		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
 		$this->setState('filter.search', $search);
 
+		$featured = $this->getUserStateFromRequest($this->context . '.filter.featured', 'filter_featured', '');
+		$this->setState('filter.featured', $featured);
+
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
 
@@ -315,6 +318,14 @@ protected function getListQuery()
 			$query->where('a.access IN (' . $access . ')');
 		}
 
+		// Filter by featured.
+		$featured = (string) $this->getState('filter.featured');
+
+		if (in_array($featured, ['0','1']))
+		{
+			$query->where('a.featured =' . (int) $featured);
+		}
+
 		// Filter by access level on categories.
 		if (!$user->authorise('core.admin'))
 		{

administrator/components/com_content/forms/filter_articles.xml

@@ -9,6 +9,17 @@
 			hint="JSEARCH_FILTER"
 		/>
 
+		<field
+			name="featured"
+			type="list"
+			onchange="this.form.submit();"
+			default=""
+			>
+			<option value="">COM_CONTENT_SELECT_FEATURED</option>
+			<option value="0">COM_CONTENT_FILTER_FEATURED_NO</option>
+			<option value="1">COM_CONTENT_FILTER_FEATURED_YES</option>
+		</field>
+
 		<field
 			name="stage"
 			type="workflowstage"

administrator/components/com_content/tmpl/article/edit.php

@@ -51,6 +51,7 @@
 		<div class="row">
 			<div class="col-md-9">
 				<fieldset class="adminform">
+					<?php echo $this->form->getLabel('articletext'); ?>
 					<?php echo $this->form->getInput('articletext'); ?>
 				</fieldset>
 			</div>

administrator/components/com_content/tmpl/featured/default.php

@@ -104,6 +104,9 @@
 								<td style="width:1%" class="text-center">
 									<?php echo HTMLHelper::_('grid.checkall'); ?>
 								</td>
+								<th scope="col" style="width:1%" class="text-center">
+									<?php echo JText::_('JFEATURED'); ?>
+								</th>
 								<th scope="col" style="width:1%; min-width:85px" class="text-center">
 									<?php echo JText::_('JSTATUS'); ?>
 								</th>
@@ -207,10 +210,12 @@
 								<td class="text-center">
 									<?php echo HTMLHelper::_('grid.id', $i, $item->id); ?>
 								</td>
+								<td class="text-center">
+									<?php echo $featuredButton->render($item->featured, $i, ['disabled' => !$canChange]); ?>
+								</td>
 								<td class="article-status">
 									<div class="d-flex">
 										<div class="btn-group tbody-icon mr-1">
-										<?php echo $featuredButton->render($item->featured, $i, ['disabled' => !$canChange]); ?>
 										<?php
 
 											$options = [

administrator/components/com_cpanel/tmpl/cpanel/default.php

@@ -10,9 +10,16 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 
+HTMLHelper::_('behavior.core');
+Text::script('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS');
+Text::script('COM_CPANEL_UNPUBLISH_MODULE_ERROR');
+
+HTMLHelper::_('script', 'com_cpanel/admin-cpanel-default.min.js', array('version' => 'auto', 'relative' => true));
+
 $user = Factory::getUser();
 ?>
 
@@ -31,7 +38,7 @@
 		</div>
 	<?php endif; ?>
 </div>
-<div class="row">
+<div id="cpanel-modules" class="row">
 	<?php
 	$cols = 0;
 	foreach ($this->modules as $module)

administrator/components/com_fields/Table/FieldTable.php

@@ -143,16 +143,14 @@ public function check()
 		}
 		else
 		{
+			$this->modified_time = $this->getDbo()->getNullDate();
+			$this->modified_by = 0;
+
 			if (!(int) $this->created_time)
 			{
 				$this->created_time = $date->toSql();
 			}
 
-			if (!(int) $this->modified_time)
-			{
-				$this->modified_time = $date->toSql();
-			}
-
 			if (empty($this->created_user_id))
 			{
 				$this->created_user_id = $user->get('id');

administrator/components/com_fields/Table/GroupTable.php

@@ -102,6 +102,9 @@ public function check()
 		}
 		else
 		{
+			$this->modified = $this->getDbo()->getNullDate();
+			$this->modified_by = 0;
+
 			if (!(int) $this->created)
 			{
 				$this->created = $date->toSql();

administrator/components/com_installer/Controller/DisplayController.php

@@ -58,8 +58,6 @@ public function display($cachable = false, $urlparams = false)
 			// Push document object into the view.
 			$view->document = $document;
 
-			// Load the submenu.
-			InstallerHelper::addSubmenu($vName);
 			$view->display();
 		}
 

administrator/components/com_installer/Helper/InstallerHelper.php

@@ -22,59 +22,6 @@
  */
 class InstallerHelper
 {
-	/**
-	 * Configure the Linkbar.
-	 *
-	 * @param   string  $vName  The name of the active view.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	public static function addSubmenu($vName = 'install')
-	{
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_INSTALL'),
-			'index.php?option=com_installer',
-			$vName == 'install'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_UPDATE'),
-			'index.php?option=com_installer&view=update',
-			$vName == 'update'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_MANAGE'),
-			'index.php?option=com_installer&view=manage',
-			$vName == 'manage'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_DISCOVER'),
-			'index.php?option=com_installer&view=discover',
-			$vName == 'discover'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_DATABASE'),
-			'index.php?option=com_installer&view=database',
-			$vName == 'database'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_WARNINGS'),
-			'index.php?option=com_installer&view=warnings',
-			$vName == 'warnings'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_LANGUAGES'),
-			'index.php?option=com_installer&view=languages',
-			$vName == 'languages'
-		);
-		\JHtmlSidebar::addEntry(
-			Text::_('COM_INSTALLER_SUBMENU_UPDATESITES'),
-			'index.php?option=com_installer&view=updatesites',
-			$vName == 'updatesites'
-		);
-	}
-
 	/**
 	 * Get a list of filter options for the extension types.
 	 *

administrator/components/com_installer/View/Discover/HtmlView.php

@@ -70,8 +70,6 @@ protected function addToolbar()
 		ToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false);
 		ToolbarHelper::divider();
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=discover');
-
 		parent::addToolbar();
 
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER');

administrator/components/com_installer/View/Installer/HtmlView.php

@@ -111,8 +111,5 @@ protected function addToolbar()
 			ToolbarHelper::preferences('com_installer');
 			ToolbarHelper::divider();
 		}
-
-		// Render side bar.
-		$this->sidebar = \JHtmlSidebar::render();
 	}
 }

administrator/components/com_installer/View/Manage/HtmlView.php

@@ -82,8 +82,6 @@ protected function addToolbar()
 			ToolbarHelper::divider();
 		}
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE');
 	}

administrator/components/com_installer/View/Update/HtmlView.php

@@ -81,8 +81,6 @@ protected function addToolbar()
 		ToolbarHelper::custom('update.purge', 'purge', 'purge', 'COM_INSTALLER_TOOLBAR_PURGE', false);
 		ToolbarHelper::divider();
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE');
 	}

administrator/components/com_installer/View/Updatesites/HtmlView.php

@@ -88,8 +88,6 @@ protected function addToolbar()
 			ToolbarHelper::custom('updatesites.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
 		}
 
-		\JHtmlSidebar::setAction('index.php?option=com_installer&view=updatesites');
-
 		parent::addToolbar();
 		ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES');
 	}

administrator/components/com_installer/tmpl/database/default.php

@@ -24,10 +24,7 @@
 <div id="installer-database" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=database'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<div class="control-group">
 						<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>

administrator/components/com_installer/tmpl/discover/default.php

@@ -22,10 +22,7 @@
 <div id="installer-discover" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=discover'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>

administrator/components/com_installer/tmpl/install/default.php

@@ -31,10 +31,7 @@
 
 	<form enctype="multipart/form-data" action="<?php echo Route::_('index.php?option=com_installer&view=install'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php // Render messages set by extension install scripts here ?>
 					<?php if ($this->showMessage) : ?>

administrator/components/com_installer/tmpl/installer/default_ftp.php

@@ -12,7 +12,7 @@
 use Joomla\CMS\Language\Text;
 
 ?>
-<fieldset title="<?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
+<fieldset>
 	<legend><?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
 
 	<?php echo Text::_('COM_INSTALLER_MSG_DESCFTP'); ?>

administrator/components/com_installer/tmpl/languages/default.php

@@ -22,10 +22,7 @@
 <div id="installer-languages" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 					<?php if (empty($this->items)) : ?>

administrator/components/com_installer/tmpl/manage/default.php

@@ -22,10 +22,7 @@
 <div id="installer-manage" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=manage'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>

administrator/components/com_installer/tmpl/update/default.php

@@ -22,10 +22,7 @@
 <div id="installer-update" class="clearfix">
 	<form action="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" method="post" name="adminForm" id="adminForm">
 		<div class="row">
-			<div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-			</div>
-			<div class="col-md-10">
+			<div class="col-md-12">
 				<div id="j-main-container" class="j-main-container">
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>