Merge branch '4.0-dev' into switcher-label

joomla · Jan 26, 2020 · fe6c0af · fe6c0af
2 parents 3e92b9d + 9daead9
commit fe6c0af
Show file tree

Hide file tree

Showing 658 changed files with 12,283 additions and 6,965 deletions.
diff --git a/administrator/components/com_actionlogs/actionlogs.xml b/administrator/components/com_actionlogs/actionlogs.xml
@@ -27,8 +27,8 @@
 			<folder>View</folder>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_actionlogs.ini</language>
-			<language tag="en-GB">language/en-GB.com_actionlogs.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_actionlogs.ini</language>
+			<language tag="en-GB">language/en-GB/com_actionlogs.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_actionlogs/forms/filter_actionlogs.xml b/administrator/components/com_actionlogs/forms/filter_actionlogs.xml
@@ -4,6 +4,7 @@
 		<field
 			name="search"
 			type="text"
+			inputmode="search"
 			label="COM_ACTIONLOGS_FILTER_SEARCH_DESC"
 			description="COM_ACTIONLOGS_SEARCH_IN_NAME"
 			hint="JSEARCH_FILTER"

diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
@@ -27,8 +27,8 @@
 			<folder>View</folder>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_admin.ini</language>
-			<language tag="en-GB">language/en-GB.com_admin.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_admin.ini</language>
+			<language tag="en-GB">language/en-GB/com_admin.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_config.php b/administrator/components/com_admin/tmpl/sysinfo/default_config.php
@@ -35,6 +35,9 @@
 						<?php echo $key; ?>
 					</th>
 					<td>
+						<?php if (is_bool($value)) : ?>
+							<?php $value = $value === true ? 'true' : 'false'; ?>
+						<?php endif; ?>
 						<?php echo htmlspecialchars($value, ENT_QUOTES); ?>
 					</td>
 				</tr>

diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml
@@ -13,15 +13,15 @@
 		<filename>ajax.php</filename>
 	</files>
 	<languages folder="site">
-		<language tag="en-GB">language/en-GB.com_ajax.ini</language>
+		<language tag="en-GB">language/en-GB/com_ajax.ini</language>
 	</languages>
 	<administration>
 		<files folder="admin">
 			<filename>ajax.php</filename>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_ajax.ini</language>
-			<language tag="en-GB">language/en-GB.com_ajax.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_ajax.ini</language>
+			<language tag="en-GB">language/en-GB/com_ajax.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -337,7 +337,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 				. htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '<br><br>' . $additional;
 			$classes = 'badge ' . $labelClass;
 
-			$items[$langCode]['link'] = '<a href="' . $url . '" title="' . $language->title . '" class="' . $classes . '">' . $text . '</a>'
+			$items[$langCode]['link'] = '<a href="' . $url . '" class="' . $classes . '">' . $text . '</a>'
 				. '<div role="tooltip">' . $tooltip . '</div>';
 		}
 

diff --git a/administrator/components/com_associations/associations.xml b/administrator/components/com_associations/associations.xml
@@ -32,8 +32,8 @@
 			<folder>View</folder>
 		</files>
 		<languages folder="admin">
-			<language tag="en-GB">language/en-GB.com_associations.ini</language>
-			<language tag="en-GB">language/en-GB.com_associations.sys.ini</language>
+			<language tag="en-GB">language/en-GB/com_associations.ini</language>
+			<language tag="en-GB">language/en-GB/com_associations.sys.ini</language>
 		</languages>
 	</administration>
 </extension>
diff --git a/administrator/components/com_associations/forms/filter_associations.xml b/administrator/components/com_associations/forms/filter_associations.xml
@@ -24,6 +24,7 @@
 		<field
 			name="search"
 			type="text"
+			inputmode="search"
 			label="COM_ASSOCIATIONS_FILTER_SEARCH_LABEL"
 			description="COM_ASSOCIATIONS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"

diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php
@@ -22,7 +22,9 @@
 
 HTMLHelper::_('script', 'com_associations/sidebyside.js', ['version' => 'auto', 'relative' => true]);
 HTMLHelper::_('stylesheet', 'com_associations/sidebyside.css', ['version' => 'auto', 'relative' => true]);
-HTMLHelper::_('webcomponent', 'system/joomla-core-loader.min.js', ['version' => 'auto', 'relative' => true]);
+
+$this->document->getWebAssetManager()
+	->useScript('webcomponent.core-loader');
 
 $options = [
 	'layout'   => $this->app->input->get('layout', '', 'string'),

diff --git a/administrator/components/com_banners/Helper/BannersHelper.php b/administrator/components/com_banners/Helper/BannersHelper.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
+use Joomla\Database\ParameterType;
 
 /**
  * Banners component helper.
@@ -34,16 +35,31 @@ class BannersHelper extends ContentHelper
 	 */
 	public static function updateReset()
 	{
-		$db       = Factory::getDbo();
-		$query    = $db->getQuery(true)
+		$db   = Factory::getDbo();
+		$date = Factory::getDate();
+		$app  = Factory::getApplication();
+		$user = $app->getIdentity();
+
+		$query = $db->getQuery(true)
 			->select('*')
-			->from('#__banners')
-			->where($db->quote(Factory::getDate()) . ' >= ' . $db->quote('reset'))
-			->where($db->quoteName('reset') . ' IS NOT NULL')
+			->from($db->quoteName('#__banners'))
 			->where(
-				'(' . $db->quoteName('checked_out') . ' = 0 OR ' . $db->quoteName('checked_out') . ' = '
-				. (int) $db->quote(Factory::getUser()->id) . ')'
-			);
+				[
+					$db->quoteName('reset') . ' <= :date',
+					$db->quoteName('reset') . ' IS NOT NULL',
+				]
+			)
+			->bind(':date', $date)
+			->extendWhere(
+				'AND',
+				[
+					$db->quoteName('checked_out') . ' = 0',
+					$db->quoteName('checked_out') . ' = :userId',
+				],
+				'OR'
+			)
+			->bind(':userId', $user->id, ParameterType::INTEGER);
+
 		$db->setQuery($query);
 
 		try
@@ -52,7 +68,7 @@ public static function updateReset()
 		}
 		catch (\RuntimeException $e)
 		{
-			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+			$app->enqueueMessage($e->getMessage(), 'error');
 
 			return false;
 		}
@@ -64,7 +80,7 @@ public static function updateReset()
 			if ($purchaseType < 0 && $row->cid)
 			{
 				/** @var \Joomla\Component\Banners\Administrator\Table\ClientTable $client */
-				$client = Table::getInstance('Client', '\\Joomla\\Component\\Banners\\Administrator\\Table\\');
+				$client = Table::getInstance('ClientTable', '\\Joomla\\Component\\Banners\\Administrator\\Table\\');
 				$client->load($row->cid);
 				$purchaseType = $client->purchase_type;
 			}
@@ -82,29 +98,36 @@ public static function updateReset()
 					break;
 				case 2:
 					$date = Factory::getDate('+1 year ' . date('Y-m-d'));
-					$reset = $db->quote($date->toSql());
+					$reset = $date->toSql();
 					break;
 				case 3:
 					$date = Factory::getDate('+1 month ' . date('Y-m-d'));
-					$reset = $db->quote($date->toSql());
+					$reset = $date->toSql();
 					break;
 				case 4:
 					$date = Factory::getDate('+7 day ' . date('Y-m-d'));
-					$reset = $db->quote($date->toSql());
+					$reset = $date->toSql();
 					break;
 				case 5:
 					$date = Factory::getDate('+1 day ' . date('Y-m-d'));
-					$reset = $db->quote($date->toSql());
+					$reset = $date->toSql();
 					break;
 			}
 
 			// Update the row ordering field.
-			$query->clear()
+			$query = $db->getQuery(true)
 				->update($db->quoteName('#__banners'))
-				->set($db->quoteName('reset') . ' = ' . $db->quote($reset))
-				->set($db->quoteName('impmade') . ' = ' . $db->quote(0))
-				->set($db->quoteName('clicks') . ' = ' . $db->quote(0))
-				->where($db->quoteName('id') . ' = ' . $db->quote($row->id));
+				->set(
+					[
+						$db->quoteName('reset') . ' = :reset',
+						$db->quoteName('impmade') . ' = 0',
+						$db->quoteName('clicks') . ' = 0',
+					]
+				)
+				->where($db->quoteName('id') . ' = :id')
+				->bind(':reset', $reset, $reset === null ? ParameterType::NULL : ParameterType::STRING)
+				->bind(':id', $row->id, ParameterType::INTEGER);
+
 			$db->setQuery($query);
 
 			try
@@ -113,7 +136,7 @@ public static function updateReset()
 			}
 			catch (\RuntimeException $e)
 			{
-				Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+				$app->enqueueMessage($e->getMessage(), 'error');
 
 				return false;
 			}
@@ -133,10 +156,15 @@ public static function getClientOptions()
 
 		$db = Factory::getDbo();
 		$query = $db->getQuery(true)
-			->select('id AS value, name AS text')
-			->from('#__banner_clients AS a')
-			->where('a.state = 1')
-			->order('a.name');
+			->select(
+				[
+					$db->quoteName('id', 'value'),
+					$db->quoteName('name', 'text'),
+				]
+			)
+			->from($db->quoteName('#__banner_clients', 'a'))
+			->where($db->quoteName('a.state') . ' = 1')
+			->order($db->quoteName('a.name'));
 
 		// Get the options.
 		$db->setQuery($query);

diff --git a/administrator/components/com_banners/Model/BannerModel.php b/administrator/components/com_banners/Model/BannerModel.php
@@ -337,8 +337,8 @@ protected function prepareTable($table)
 			{
 				$db = $this->getDbo();
 				$query = $db->getQuery(true)
-					->select('MAX(ordering)')
-					->from('#__banners');
+					->select('MAX(' . $db->quoteName('ordering') . ')')
+					->from($db->quoteName('#__banners'));
 
 				$db->setQuery($query);
 				$max = $db->loadResult();