Przeglądaj źródła

Fixed timezone inconsistencies.

Alan Lam 8 lat temu
rodzic
commit
15e108df83
4 zmienionych plików z 27 dodań i 22 usunięć
  1. 10 10
      controllers/project_add.php
  2. 11 10
      controllers/project_edit.php
  3. 4 0
      engine/util.php
  4. 2 2
      views/project_form.php

+ 10 - 10
controllers/project_add.php

@@ -39,8 +39,8 @@ if($submit) {
 		$project->max_age = http::value("max_age", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
 
-		$project->dts_start = http::getDateFromFields("date_start");
-		$project->dts_deadline = http::getDateFromFields("date_deadline");
+		$date_start = http::getDateFromFields("date_start");
+		$date_deadline = http::getDateFromFields("date_deadline");
 
 		$form_exception = new FormException;
 
@@ -54,18 +54,18 @@ if($submit) {
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
-		if(empty($project->dts_start)) $form_exception->addError("Start Date is required.");
-		if(empty($project->dts_deadline)) $form_exception->addError("Deadline is required.");
+		if(empty($date_start)) $form_exception->addError("Start Date is required.");
+		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");
 
-		$project->dts_start .= " 00:00:00";
-		$project->dts_deadline .= " 23:59:59";
-		$project->dts_created = Util::getDateTime();
+		$unix_start = strtotime($date_start . " 00:00:00");
+		$unix_deadline = strtotime($date_deadline . " 23:59:59");
 
-		$unix_start = strtotime($project->dts_start);
-		$unix_end = strtotime($project->dts_deadline);
+		$project->dts_start = Util::getDateTime($unix_start);
+		$project->dts_deadline = Util::getDateTime($unix_deadline);
+		$project->dts_created = Util::getDateTime();
 
-		if($unix_start > $unix_end) $form_exception->addError("Start Date cannot be after the Deadline.");
+		if($unix_start > $unix_deadline) $form_exception->addError("Start Date cannot be after the Deadline.");
 
 		// Verify location IDs
 		Location::load($location_ids);

+ 11 - 10
controllers/project_edit.php

@@ -39,8 +39,9 @@ if($submit) {
 		$project->min_age = http::value("min_age", "int");
 		$project->max_age = http::value("max_age", "int");
 		$project->default_tester_fee = http::value("default_tester_fee", "float");
-		$project->dts_start = http::getDateFromFields("date_start");
-		$project->dts_deadline = http::getDateFromFields("date_deadline");
+
+		$date_start = http::getDateFromFields("date_start");
+		$date_deadline = http::getDateFromFields("date_deadline");
 
 		$form_exception = new FormException;
 
@@ -54,18 +55,18 @@ if($submit) {
 		if(empty($project->min_age)) $form_exception->addError("Minimum age is required.");
 		if(empty($project->max_age)) $form_exception->addError("Maximum age is required.");
 		if(empty($project->default_tester_fee)) $form_exception->addError("Default tester fee is required.");
-		if(empty($project->dts_start)) $form_exception->addError("Start Date is required.");
-		if(empty($project->dts_deadline)) $form_exception->addError("Deadline is required.");
+		if(empty($date_start)) $form_exception->addError("Start Date is required.");
+		if(empty($date_deadline)) $form_exception->addError("Deadline is required.");
 		if($project->min_age > $project->max_age) $form_exception->addError("Minimum age cannot be greater than maximum age.");
 
-		$project->dts_start .= " 00:00:00";
-		$project->dts_deadline .= " 23:59:59";
-		$project->dts_created = Util::getDateTime();
+		$unix_start = strtotime($date_start . " 00:00:00");
+		$unix_deadline = strtotime($date_deadline . " 23:59:59");
 
-		$unix_start = strtotime($project->dts_start);
-		$unix_end = strtotime($project->dts_deadline);
+		$project->dts_start = Util::getDateTime($unix_start);
+		$project->dts_deadline = Util::getDateTime($unix_deadline);
+		$project->dts_created = Util::getDateTime();
 
-		if($unix_start > $unix_end) $form_exception->addError("Start Date cannot be after the Deadline.");
+		if($unix_start > $unix_deadline) $form_exception->addError("Start Date cannot be after the Deadline.");
 
 		// Verify location IDs
 		Location::load($location_ids_to_add);

+ 4 - 0
engine/util.php

@@ -192,6 +192,10 @@ class Util {
 		return gmdate("Y-m-d H:i:s", $time);
 	}
 
+	public static function getUnixTimeFromUTC($dts) {
+		return strtotime($dts . " UTC");
+	}
+
 	public static function getDurationFromDTS($dts1, $dts2) {
 		$tz = date_default_timezone_get();
 		date_default_timezone_set("UTC");

+ 2 - 2
views/project_form.php

@@ -1,9 +1,9 @@
 <?php
 
-$date_start = explode(" ", $project->dts_start)[0];
+$date_start = explode(" ", date("Y-m-d H:i:s", strtotime($project->dts_start . " UTC")))[0];
 $date_start_parts = explode("-", $date_start);
 
-$date_deadline = explode(" ", $project->dts_deadline)[0];
+$date_deadline = explode(" ", date("Y-m-d H:i:s", strtotime($project->dts_deadline . " UTC")))[0];
 $date_deadline_parts = explode("-", $date_deadline);
 
 ?>