Merge branch 'staging' into patch-1

joomla · Apr 24, 2019 · 7f2a78a · 7f2a78a
2 parents 83ff430 + ae60493
commit 7f2a78a
Show file tree

Hide file tree

Showing 106 changed files with 2,683 additions and 2,234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -184,6 +184,9 @@ Desktop.ini
 /libraries/vendor/symfony/polyfill-util/LegacyTestListener.php
 /libraries/vendor/symfony/polyfill-util/TestListener.php
 /libraries/vendor/symfony/polyfill-util/TestListenerTrait.php
+/libraries/vendor/symfony/polyfill-util/TestListenerForV5.php
+/libraries/vendor/symfony/polyfill-util/TestListenerForV6.php
+/libraries/vendor/symfony/polyfill-util/TestListenerForV7.php
 /libraries/vendor/symfony/yaml/Tests
 /libraries/vendor/symfony/yaml/.gitignore
 /libraries/vendor/symfony/yaml/CHANGELOG.md

diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php
@@ -228,7 +228,7 @@ public function delete()
 				$query->where('track_date <= ' . $db->quote($end));
 			}
 
-			$where = '1';
+			$where = '1 = 1';
 
 			// Filter by client
 			$clientId = $this->getState('filter.client_id');

diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
@@ -371,6 +371,7 @@ public function getItem($pk = null)
 	public function getForm($data = array(), $loadData = true)
 	{
 		$app = JFactory::getApplication();
+		$user = JFactory::getUser();
 
 		// Get the form.
 		$form = $this->loadForm('com_content.article', 'article', array('control' => 'jform', 'load_data' => $loadData));
@@ -402,10 +403,14 @@ public function getForm($data = array(), $loadData = true)
 				$form->setFieldAttribute('catid', 'action', 'core.edit.own');
 			}
 			else
-			// Existing record. We can't edit the category in frontend.
+			// Existing record. We can't edit the category in frontend if not edit.state.
 			{
-				$form->setFieldAttribute('catid', 'readonly', 'true');
-				$form->setFieldAttribute('catid', 'filter', 'unset');
+				if ($id != 0 && (!$user->authorise('core.edit.state', 'com_content.article.' . (int) $id))
+					|| ($id == 0 && !$user->authorise('core.edit.state', 'com_content')))
+				{
+					$form->setFieldAttribute('catid', 'readonly', 'true');
+					$form->setFieldAttribute('catid', 'filter', 'unset');
+				}
 			}
 		}
 		else
@@ -414,8 +419,6 @@ public function getForm($data = array(), $loadData = true)
 			$form->setFieldAttribute('catid', 'action', 'core.create');
 		}
 
-		$user = JFactory::getUser();
-
 		// Check for existing article.
 		// Modify the form based on Edit State access controls.
 		if ($id != 0 && (!$user->authorise('core.edit.state', 'com_content.article.' . (int) $id))

diff --git a/administrator/components/com_fields/models/field.php b/administrator/components/com_fields/models/field.php
@@ -343,34 +343,6 @@ public function getItem($pk = null)
 
 			$db->setQuery($query);
 			$result->assigned_cat_ids = $db->loadColumn() ?: array(0);
-
-			// Convert the created and modified dates to local user time for
-			// display in the form.
-			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
-
-			if ((int) $result->created_time)
-			{
-				$date = new JDate($result->created_time);
-				$date->setTimezone($tz);
-
-				$result->created_time = $date->toSql(true);
-			}
-			else
-			{
-				$result->created_time = null;
-			}
-
-			if ((int) $result->modified_time)
-			{
-				$date = new JDate($result->modified_time);
-				$date->setTimezone($tz);
-
-				$result->modified_time = $date->toSql(true);
-			}
-			else
-			{
-				$result->modified_time = null;
-			}
 		}
 
 		return $result;

diff --git a/administrator/components/com_fields/models/group.php b/administrator/components/com_fields/models/group.php
@@ -325,31 +325,6 @@ public function getItem($pk = null)
 			{
 				$item->params = new Registry($item->params);
 			}
-
-			// Convert the created and modified dates to local user time for display in the form.
-			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
-
-			if ((int) $item->created)
-			{
-				$date = new JDate($item->created);
-				$date->setTimezone($tz);
-				$item->created = $date->toSql(true);
-			}
-			else
-			{
-				$item->created = null;
-			}
-
-			if ((int) $item->modified)
-			{
-				$date = new JDate($item->modified);
-				$date->setTimezone($tz);
-				$item->modified = $date->toSql(true);
-			}
-			else
-			{
-				$item->modified = null;
-			}
 		}
 
 		return $item;

diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php
@@ -398,8 +398,7 @@ public function purge()
 		$db->execute();
 
 		$query->clear()
-			->delete($db->quoteName('#__finder_taxonomy_map'))
-			->where('1');
+			->delete($db->quoteName('#__finder_taxonomy_map'));
 		$db->setQuery($query);
 		$db->execute();
 

diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml
@@ -75,6 +75,7 @@
 			description="COM_USERS_FIELD_REVIEW_TIME_DESC"
 			default="NOW"
 			translateformat="true"
+			filter="user_utc"
 		/>
 
 		<field

diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -43,6 +43,7 @@ COM_MODULES_FIELD_CLIENT_ID_DESC="The location of the module, Frontend or Backen
 COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
 COM_MODULES_FIELD_CONTENT_DESC="Text"
 COM_MODULES_FIELD_CONTENT_LABEL="Text"
+COM_MODULES_FIELD_CONTENT_TOO_LARGE="The content exceeds allowed limits"
 COM_MODULES_FIELD_MODULE_DESC="Module type."
 COM_MODULES_FIELD_MODULE_LABEL="Module Type"
 COM_MODULES_FIELD_MODULECLASS_SFX_DESC="A suffix to be applied to the CSS class of the module. This allows for individual module styling."

diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
@@ -12,8 +12,12 @@ PLG_LDAP_FIELD_EMAIL_DESC="LDAP attribute which has the User's email address."
 PLG_LDAP_FIELD_EMAIL_LABEL="Map: Email"
 PLG_LDAP_FIELD_FULLNAME_DESC="LDAP attribute which has the User's full name."
 PLG_LDAP_FIELD_FULLNAME_LABEL="Map: Full Name"
+PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_DESC="When enabled ignore the server certificate, this is useful when running for example Samba 4 with a self-signed certificate."
+PLG_LDAP_FIELD_IGNORE_REQCERT_TLS_LABEL="Ignore Certificate"
 PLG_LDAP_FIELD_HOST_DESC="Eg: openldap.example.com."
 PLG_LDAP_FIELD_HOST_LABEL="Host"
+PLG_LDAP_FIELD_LDAPDEBUG_DESC="Enables debug hardcoded to level 7"
+PLG_LDAP_FIELD_LDAPDEBUG_LABEL="Debug"
 PLG_LDAP_FIELD_NEGOCIATE_DESC="Negotiate TLS encryption with the LDAP server. This requires all traffic to and from the LDAP server to be encrypted."
 PLG_LDAP_FIELD_NEGOCIATE_LABEL="Negotiate TLS"
 PLG_LDAP_FIELD_PASSWORD_DESC="The Connect Password is the password of an administrative account. This is used in Authenticate then Bind and Authenticated Compare authorisation methods."

diff --git a/components/com_banners/models/banner.php b/components/com_banners/models/banner.php
@@ -78,7 +78,7 @@ public function click()
 
 		if ($trackClicks > 0)
 		{
-			$trackDate = JFactory::getDate()->format('Y-m-d H');
+			$trackDate = JFactory::getDate()->toSql();
 
 			$query->clear()
 				->select($db->quoteName('count'))

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
@@ -222,7 +222,7 @@ public function getItems()
 	 */
 	public function impress()
 	{
-		$trackDate = JFactory::getDate()->format('Y-m-d H');
+		$trackDate = JFactory::getDate()->toSql();
 		$items     = $this->getItems();
 		$db        = $this->getDbo();
 		$query     = $db->getQuery(true);