Handle exceptions

Fix tests

Fix again

Author: iMattPro

controller/admin_input.php

@@ -325,25 +325,28 @@ protected function send_ajax_response($success, $text)
 	 */
 	protected function validate_date($date, $type)
 	{
-		$timestamp = 0;
-		if (preg_match('#^\d{4}-\d{2}-\d{2}$#', $date))
+		if ($date === '')
 		{
-			// Create a UTC midnight timestamp for storage consistency
-			$datetime = \DateTime::createFromFormat(ext::DATE_FORMAT, $date, new \DateTimeZone('UTC'));
-			$datetime->setTime(0, 0, 0); // Ensure midnight (00:00:00)
-			$timestamp = $datetime->getTimestamp();
-
-			// Compare against a user's timezone to prevent timezone confusion
-			// 'today' creates today's date at midnight in the user's timezone
-			$user_today = new \DateTime('today', $this->user->timezone);
-			if ($timestamp < $user_today->getTimestamp())
-			{
-				$this->errors[] = 'AD_' . $type . '_DATE_INVALID';
-			}
+			return 0;
+		}
+
+		if (!preg_match('#^\d{4}-\d{2}-\d{2}$#', $date))
+		{
+			$this->errors[] = 'AD_' . $type . '_DATE_INVALID';
+			return 0;
 		}
-		else if ($date !== '')
+
+		// Create a UTC midnight timestamp for storage consistency
+		$datetime = \DateTime::createFromFormat(ext::DATE_FORMAT, $date, new \DateTimeZone('UTC'));
+		$datetime->setTime(0, 0, 0); // Ensure midnight (00:00:00)
+		$timestamp = $datetime->getTimestamp();
+
+		// Compare against user's current day to avoid timezone confusion
+		$user_today = new \DateTime('today', $this->user->timezone);
+		if ($timestamp < $user_today->getTimestamp())
 		{
 			$this->errors[] = 'AD_' . $type . '_DATE_INVALID';
+			return 0;
 		}
 
 		return $timestamp;

tests/functional/acp_manage_test.php

@@ -72,8 +72,8 @@ public function test_acp_add()
 
 		// Confirm error when submitting older end date than start date
 		$form_data = array(
-			'ad_start_date'	=> '2018-01-01',
-			'ad_end_date'	=> '2017-01-01',
+			'ad_start_date'	=> '2035-01-01',
+			'ad_end_date'	=> '2034-01-01',
 		);
 		$this->submit_with_error($crawler, $form_data, $this->lang('END_DATE_TOO_SOON'));
 
@@ -119,8 +119,8 @@ public function test_acp_add()
 			'ad_note'		=> 'Functional test note',
 			'ad_code'		=> '<!-- SAMPLE ADD CODE -->',
 			'ad_enabled'	=> 1,
-			'ad_start_date'	=> '2030-01-01',
-			'ad_end_date'	=> '2035-01-01',
+			'ad_start_date'	=> '2035-01-01',
+			'ad_end_date'	=> '2036-01-01',
 			'ad_priority'	=> 1,
 			'ad_views_limit'	=> 0,
 			'ad_clicks_limit'	=> 0,
@@ -145,7 +145,7 @@ public function test_acp_add()
 		$crawler = $this->get_manage_page();
 		self::assertStringContainsString('Functional test name', $crawler->text());
 		$this->assertContainsLang('ENABLED', $crawler->text());
-		self::assertStringContainsString('2035-01-01', $crawler->text());
+		self::assertStringContainsString('2036-01-01', $crawler->text());
 
 		// Confirm the log entry has been added correctly
 		$crawler = self::request('GET', "adm/index.php?i=acp_logs&mode=admin&sid={$this->sid}");
@@ -190,8 +190,8 @@ public function test_acp_edit()
 
 		// Confirm error when submitting older end date than start date
 		$form_data = array(
-			'ad_start_date'	=> '2018-01-01',
-			'ad_end_date'	=> '2017-01-01',
+			'ad_start_date'	=> '2035-01-01',
+			'ad_end_date'	=> '2034-01-01',
 		);
 		$this->submit_with_error($crawler, $form_data, $this->lang('END_DATE_TOO_SOON'));
 
@@ -237,8 +237,8 @@ public function test_acp_edit()
 			'ad_note'		=> 'Functional test note',
 			'ad_code'		=> '<!-- SAMPLE ADD CODE EDITED -->',
 			'ad_enabled'	=> 0,
-			'ad_start_date'	=> '2030-01-02',
-			'ad_end_date'	=> '2035-01-02',
+			'ad_start_date'	=> '2035-01-02',
+			'ad_end_date'	=> '2036-01-02',
 			'ad_priority'	=> 2,
 			'ad_views_limit'	=> 0,
 			'ad_clicks_limit'	=> 0,
@@ -263,8 +263,8 @@ public function test_acp_edit()
 		$crawler = $this->get_manage_page();
 		self::assertStringContainsString('Functional test name edited', $crawler->text());
 		$this->assertContainsLang('DISABLED', $crawler->text());
-		self::assertStringContainsString('2030-01-02', $crawler->text());
 		self::assertStringContainsString('2035-01-02', $crawler->text());
+		self::assertStringContainsString('2036-01-02', $crawler->text());
 
 		// Confirm the log entry has been added correctly
 		$crawler = self::request('GET', "adm/index.php?i=acp_logs&mode=admin&sid={$this->sid}");