[4.0] All datetime changes - only for testing - don't merge

administrator/components/com_actionlogs/Model/ActionlogsModel.php

@@ -150,8 +150,8 @@ protected function getListQuery()
 		{
 			$date = $this->buildDateRange($dateRange);
 
-			// If the chosen range is not more than a year ago
-			if ($date['dNow'] != false)
+			// If a range was chosen and it is not more than a year ago
+			if ($date['dNow'] != false && $date['dStart'] != false)
 			{
 				$dStart = $date['dStart']->format('Y-m-d H:i:s');
 				$dNow   = $date['dNow']->format('Y-m-d H:i:s');

administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-09-26.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `#__privacy_requests` MODIFY `requested_at` datetime NOT NULL;
+ALTER TABLE `#__privacy_requests` MODIFY `confirm_token_created_at` datetime NULL DEFAULT NULL;
+
+ALTER TABLE `#__privacy_consents` MODIFY `created` datetime NOT NULL;
+
+UPDATE `#__privacy_requests` SET `confirm_token_created_at` = NULL WHERE `confirm_token_created_at` = '0000-00-00 00:00:00';

administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-09-28.sql

@@ -0,0 +1,41 @@
+ALTER TABLE `#__users` MODIFY `registerDate` datetime NOT NULL;
+ALTER TABLE `#__users` MODIFY `lastvisitDate` datetime NOT NULL;
+
+ALTER TABLE `#__users` MODIFY `lastResetTime` datetime NULL DEFAULT NULL;
+
+ALTER TABLE `#__user_notes` MODIFY `created_time` datetime NOT NULL;
+ALTER TABLE `#__user_notes` MODIFY `modified_time` datetime NOT NULL;
+
+ALTER TABLE `#__user_notes` MODIFY `review_time` datetime NULL DEFAULT NULL;
+ALTER TABLE `#__user_notes` MODIFY `publish_up` datetime NULL DEFAULT NULL;
+ALTER TABLE `#__user_notes` MODIFY `publish_down` datetime NULL DEFAULT NULL;
+ALTER TABLE `#__user_notes` MODIFY `checked_out_time` datetime NULL DEFAULT NULL;
+
+UPDATE `#__users` SET `lastvisitDate` = `registerDate` WHERE `lastvisitDate` = '0000-00-00 00:00:00';
+
+UPDATE `#__users` SET `lastResetTime` = NULL WHERE `lastResetTime` = '0000-00-00 00:00:00';
+
+UPDATE `#__user_notes` SET `modified_time` = `created_time` WHERE `modified_time` = '0000-00-00 00:00:00';
+
+UPDATE `#__user_notes` SET `review_time` = NULL WHERE `review_time` = '0000-00-00 00:00:00';
+UPDATE `#__user_notes` SET `publish_up` = NULL WHERE `publish_up` = '0000-00-00 00:00:00';
+UPDATE `#__user_notes` SET `publish_down` = NULL WHERE `publish_down` = '0000-00-00 00:00:00';
+UPDATE `#__user_notes` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
+
+UPDATE `#__ucm_content` SET `core_modified_time` = `core_created_time`
+ WHERE `core_type_alias` = 'com_users.user'
+   AND `core_modified_time` = '0000-00-00 00:00:00';
+
+UPDATE `#__ucm_content` SET `core_modified_time` = `core_created_time`
+ WHERE `core_type_alias` = 'com_users.note'
+   AND `core_modified_time` = '0000-00-00 00:00:00';
+
+UPDATE `#__ucm_content` SET `core_publish_up` = NULL
+ WHERE `core_type_alias` = 'com_users.note'
+   AND `core_publish_up` = '0000-00-00 00:00:00';
+UPDATE `#__ucm_content` SET `core_publish_down` = NULL
+ WHERE `core_type_alias` = 'com_users.note'
+   AND `core_publish_down` = '0000-00-00 00:00:00';
+UPDATE `#__ucm_content` SET `core_checked_out_time` = NULL
+ WHERE `core_type_alias` = 'com_users.note'
+   AND `core_checked_out_time` = '0000-00-00 00:00:00';

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-09-26.sql

@@ -0,0 +1,8 @@
+ALTER TABLE "#__privacy_requests" ALTER COLUMN "requested_at" DROP DEFAULT;
+
+ALTER TABLE "#__privacy_requests" ALTER COLUMN "confirm_token_created_at" DROP NOT NULL;
+ALTER TABLE "#__privacy_requests" ALTER COLUMN "confirm_token_created_at" DROP DEFAULT;
+
+ALTER TABLE "#__privacy_consents" ALTER COLUMN "created" DROP DEFAULT;
+
+UPDATE "#__privacy_requests" SET "confirm_token_created_at" = NULL WHERE "confirm_token_created_at" = '1970-01-01 00:00:00';

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-09-28.sql

@@ -0,0 +1,50 @@
+ALTER TABLE "#__users" ALTER COLUMN "registerDate" DROP DEFAULT;
+ALTER TABLE "#__users" ALTER COLUMN "lastvisitDate" DROP DEFAULT;
+
+ALTER TABLE "#__users" ALTER COLUMN "lastResetTime" DROP NOT NULL;
+ALTER TABLE "#__users" ALTER COLUMN "lastResetTime" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "created_time" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "modified_time" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "review_time" DROP NOT NULL;
+ALTER TABLE "#__user_notes" ALTER COLUMN "review_time" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "publish_up" DROP NOT NULL;
+ALTER TABLE "#__user_notes" ALTER COLUMN "publish_up" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "publish_down" DROP NOT NULL;
+ALTER TABLE "#__user_notes" ALTER COLUMN "publish_down" DROP DEFAULT;
+
+ALTER TABLE "#__user_notes" ALTER COLUMN "checked_out_time" DROP NOT NULL;
+ALTER TABLE "#__user_notes" ALTER COLUMN "checked_out_time" DROP DEFAULT;
+
+UPDATE "#__users" SET "lastvisitDate" = "registerDate" WHERE "lastvisitDate" = '1970-01-01 00:00:00';
+
+UPDATE "#__users" SET "lastResetTime" = NULL WHERE "lastResetTime" = '1970-01-01 00:00:00';
+
+UPDATE "#__user_notes" SET "modified_time" = "created_time" WHERE "modified_time" = '1970-01-01 00:00:00';
+
+UPDATE "#__user_notes" SET "review_time" = NULL WHERE "review_time" = '1970-01-01 00:00:00';
+UPDATE "#__user_notes" SET "publish_up" = NULL WHERE "publish_up" = '1970-01-01 00:00:00';
+UPDATE "#__user_notes" SET "publish_down" = NULL WHERE "publish_down" = '1970-01-01 00:00:00';
+UPDATE "#__user_notes" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
+
+UPDATE "#__ucm_content" SET "core_modified_time" = "core_created_time"
+ WHERE "core_type_alias" = 'com_users.user'
+   AND "core_modified_time" = '1970-01-01 00:00:00';
+
+UPDATE "#__ucm_content" SET "core_modified_time" = "core_created_time"
+ WHERE "core_type_alias" = 'com_users.note'
+   AND "core_modified_time" = '1970-01-01 00:00:00';
+
+UPDATE "#__ucm_content" SET "core_publish_up" = NULL
+ WHERE "core_type_alias" = 'com_users.note'
+   AND "core_publish_up" = '1970-01-01 00:00:00';
+UPDATE "#__ucm_content" SET "core_publish_down" = NULL
+ WHERE "core_type_alias" = 'com_users.note'
+   AND "core_publish_down" = '1970-01-01 00:00:00';
+UPDATE "#__ucm_content" SET "core_checked_out_time" = NULL
+ WHERE "core_type_alias" = 'com_users.note'
+   AND "core_checked_out_time" = '1970-01-01 00:00:00';

administrator/components/com_checkin/Model/CheckinModel.php

@@ -81,7 +81,6 @@ protected function populateState($ordering = 'table', $direction = 'asc')
 	public function checkin($ids = array())
 	{
 		$db = $this->getDbo();
-		$nullDate = $db->getNullDate();
 
 		if (!is_array($ids))
 		{
@@ -111,9 +110,8 @@ public function checkin($ids = array())
 			$query = $db->getQuery(true)
 				->update($db->quoteName($tn))
 				->set($db->quoteName('checked_out') . ' = DEFAULT')
-				->set($db->quoteName('checked_out_time') . ' = :checkouttime')
-				->where($db->quoteName('checked_out') . ' > 0')
-				->bind(':checkouttime', $nullDate);
+				->set($db->quoteName('checked_out_time') . ' = NULL')
+				->where($db->quoteName('checked_out') . ' > 0');
 
 			$db->setQuery($query);
 

administrator/components/com_privacy/Table/RequestTable.php

@@ -30,6 +30,14 @@
  */
 class RequestTable extends Table
 {
+	/**
+	 * Indicates that columns fully support the NULL value in the database
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_supportNullValue = true;
+
 	/**
 	 * The class constructor.
 	 *
@@ -51,7 +59,7 @@ public function __construct(DatabaseDriver $db)
 	 *
 	 * @since   3.9.0
 	 */
-	public function store($updateNulls = false)
+	public function store($updateNulls = true)
 	{
 		$date = Factory::getDate();
 
@@ -67,6 +75,11 @@ public function store($updateNulls = false)
 			{
 				$this->requested_at = $date->toSql();
 			}
+
+			if (!$this->confirm_token_created_at)
+			{
+				$this->confirm_token_created_at = null;
+			}
 		}
 
 		return parent::store($updateNulls);

administrator/components/com_users/Model/UsersModel.php

@@ -371,15 +371,19 @@ protected function getListQuery()
 			}
 		}
 
-		// Add filter for registration ranges select list
+		// Add filter for registration time ranges select list
 		$range = $this->getState('filter.range');
 
 		// Apply the range filter.
 		if ($range)
 		{
 			$dates = $this->buildDateRange($range);
 
-			if ($dates['dNow'] === false)
+			if ($dates['dStart'] === false)
+			{
+				$query->where('1 = 0');
+			}
+			elseif ($dates['dNow'] === false)
 			{
 				$query->where(
 					$db->quoteName('a.registerDate') . ' < ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s'))
@@ -394,7 +398,7 @@ protected function getListQuery()
 			}
 		}
 
-		// Add filter for registration ranges select list
+		// Add filter for last visit time ranges select list
 		$lastvisitrange = $this->getState('filter.lastvisitrange');
 
 		// Apply the range filter.
@@ -408,17 +412,17 @@ protected function getListQuery()
 					$db->quoteName('a.lastvisitDate') . ' = ' . $db->quote($dates['dStart'])
 				);
 			}
-			elseif ($dates['dNow'] === false)
+			elseif ($dates['dNow'] !== false && $dates['dStart'] !== false)
 			{
 				$query->where(
-					$db->quoteName('a.lastvisitDate') . ' < ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s'))
+					$db->quoteName('a.lastvisitDate') . ' >= ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s')) .
+					' AND ' . $db->quoteName('a.lastvisitDate') . ' <= ' . $db->quote($dates['dNow']->format('Y-m-d H:i:s'))
 				);
 			}
-			else
+			elseif ($dates['dStart'] !== false)
 			{
 				$query->where(
-					$db->quoteName('a.lastvisitDate') . ' >= ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s')) .
-					' AND ' . $db->quoteName('a.lastvisitDate') . ' <= ' . $db->quote($dates['dNow']->format('Y-m-d H:i:s'))
+					$db->quoteName('a.lastvisitDate') . ' < ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s'))
 				);
 			}
 		}
@@ -495,7 +499,7 @@ private function buildDateRange($range)
 				break;
 			case 'never':
 				$dNow = false;
-				$dStart = $this->_db->getNullDate();
+				$dStart = false;
 				break;
 		}
 

administrator/components/com_users/Table/NoteTable.php

@@ -22,6 +22,14 @@
  */
 class NoteTable extends Table
 {
+	/**
+	 * Indicates that columns fully support the NULL value in the database
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $_supportNullValue = true;
+
 	/**
 	 * Constructor
 	 *
@@ -46,15 +54,14 @@ public function __construct(DatabaseDriver $db)
 	 *
 	 * @since   2.5
 	 */
-	public function store($updateNulls = false)
+	public function store($updateNulls = true)
 	{
 		$date = Factory::getDate()->toSql();
 		$userId = Factory::getUser()->get('id');
 
 		if (!((int) $this->review_time))
 		{
-			// Null date.
-			$this->review_time = $this->getDbo()->getNullDate();
+			$this->review_time = null;
 		}
 
 		if ($this->id)
@@ -66,8 +73,9 @@ public function store($updateNulls = false)
 		else
 		{
 			// New record.
-			$this->created_time = $date;
+			$this->created_time    = $date;
 			$this->created_user_id = $userId;
+			$this->modified_time   = $date;
 		}
 
 		// Attempt to store the data.
@@ -96,7 +104,7 @@ public function check()
 
 		if (empty($this->modified_time))
 		{
-			$this->modified_time = $this->getDbo()->getNullDate();
+			$this->modified_time = $this->created_time;
 		}
 
 		return true;

administrator/components/com_users/tmpl/notes/default.php

@@ -93,7 +93,7 @@
 								<?php echo $this->escape($item->user_name); ?>
 							</td>
 							<td class="d-none d-md-table-cell">
-								<?php if ($item->review_time !== Factory::getDbo()->getNullDate()) : ?>
+								<?php if (!is_null($item->review_time)) : ?>
 									<?php echo HTMLHelper::_('date', $item->review_time, Text::_('DATE_FORMAT_LC4')); ?>
 								<?php else : ?>
 									<?php echo Text::_('COM_USERS_EMPTY_REVIEW'); ?>

administrator/components/com_users/tmpl/users/default.php

@@ -180,7 +180,7 @@
 									<?php echo PunycodeHelper::emailToUTF8($this->escape($item->email)); ?>
 								</td>
 								<td class="d-none d-xl-table-cell">
-									<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
+									<?php if ($item->lastvisitDate !== $item->registerDate) : ?>
 										<?php echo HTMLHelper::_('date', $item->lastvisitDate, Text::_('DATE_FORMAT_LC6')); ?>
 									<?php else : ?>
 										<?php echo Text::_('JNEVER'); ?>

components/com_privacy/Model/ConfirmModel.php

@@ -86,7 +86,7 @@ public function confirmRequest($data)
 		}
 
 		// A request can only be confirmed if it is in a pending status and has a confirmation token
-		if ($table->status != '0' || !$table->confirm_token)
+		if ($table->status != '0' || !$table->confirm_token || $table->confirm_token_created_at === null)
 		{
 			$this->setError(Text::_('COM_PRIVACY_ERROR_NO_PENDING_REQUESTS'));
 
@@ -104,6 +104,7 @@ public function confirmRequest($data)
 			// Invalidate the request
 			$table->status = -1;
 			$table->confirm_token = '';
+			$table->confirm_token_created_at = null;
 
 			try
 			{

components/com_users/Model/RegistrationModel.php

@@ -82,7 +82,7 @@ public function getUserIdFromToken($token)
 			->from($db->quoteName('#__users'))
 			->where($db->quoteName('activation') . ' = ' . $db->quote($token))
 			->where($db->quoteName('block') . ' = ' . 1)
-			->where($db->quoteName('lastvisitDate') . ' = ' . $db->quote($db->getNullDate()));
+			->where($db->quoteName('lastvisitDate') . ' = ' . $db->quoteName('registerDate'));
 		$db->setQuery($query);
 
 		try

components/com_users/tmpl/profile/default_core.php

@@ -39,7 +39,7 @@
 		<dt>
 			<?php echo Text::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
 		</dt>
-		<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
+		<?php if ($this->data->lastvisitDate != $this->data->registerDate) : ?>
 			<dd>
 				<?php echo HTMLHelper::_('date', $this->data->lastvisitDate, Text::_('DATE_FORMAT_LC1')); ?>
 			</dd>

installation/sql/mysql/joomla.sql

@@ -1652,11 +1652,11 @@ SELECT extension_id, 'PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE', 'P
 CREATE TABLE IF NOT EXISTS `#__privacy_requests` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `email` varchar(100) NOT NULL DEFAULT '',
-  `requested_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `requested_at` datetime NOT NULL,
   `status` tinyint(4) NOT NULL DEFAULT 0,
   `request_type` varchar(25) NOT NULL DEFAULT '',
   `confirm_token` varchar(100) NOT NULL DEFAULT '',
-  `confirm_token_created_at` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `confirm_token_created_at` datetime,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
@@ -2051,11 +2051,11 @@ CREATE TABLE IF NOT EXISTS `#__users` (
   `password` varchar(100) NOT NULL DEFAULT '',
   `block` tinyint(4) NOT NULL DEFAULT 0,
   `sendEmail` tinyint(4) DEFAULT 0,
-  `registerDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `lastvisitDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `registerDate` datetime NOT NULL,
+  `lastvisitDate` datetime NOT NULL,
   `activation` varchar(100) NOT NULL DEFAULT '',
   `params` text NOT NULL,
-  `lastResetTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Date of last password reset',
+  `lastResetTime` datetime COMMENT 'Date of last password reset',
   `resetCount` int(11) NOT NULL DEFAULT 0 COMMENT 'Count of password resets since lastResetTime',
   `otpKey` varchar(1000) NOT NULL DEFAULT '' COMMENT 'Two factor authentication encrypted keys',
   `otep` varchar(1000) NOT NULL DEFAULT '' COMMENT 'One time emergency passwords',
@@ -2099,14 +2099,14 @@ CREATE TABLE IF NOT EXISTS `#__user_notes` (
   `body` text NOT NULL,
   `state` tinyint(3) NOT NULL DEFAULT 0,
   `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
-  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `checked_out_time` datetime,
   `created_user_id` int(10) unsigned NOT NULL DEFAULT 0,
-  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_time` datetime NOT NULL,
   `modified_user_id` int(10) unsigned NOT NULL DEFAULT 0,
-  `modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `review_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_time` datetime NOT NULL,
+  `review_time` datetime,
+  `publish_up` datetime,
+  `publish_down` datetime,
   PRIMARY KEY (`id`),
   KEY `idx_user_id` (`user_id`),
   KEY `idx_category_id` (`catid`)