From 2f63a65e03d64b5e3db54430d345b7051faee63f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 16 Nov 2011 13:34:58 -0500 Subject: [PATCH 1/2] CC-3054: After recording show, recorded file is not imported properly. -fixed --- airtime_mvc/application/controllers/ApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 7ec424199..2f6f3d6dc 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -426,7 +426,7 @@ class ApiController extends Zend_Controller_Action $show_inst->setRecordedFile($file_id); $show_name = $show_inst->getName(); $show_genre = $show_inst->getGenre(); - $show_start_time = ConvertToLocalDateTimeString($show_inst->getShowInstanceStart()); + $show_start_time = Application_Model_DateHelper::ConvertToLocalDateTimeString($show_inst->getShowInstanceStart()); } catch (Exception $e){ //we've reached here probably because the show was From 4f2adc306853bf096fe37a4b7550fcd15148ec47 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 16 Nov 2011 14:06:59 -0500 Subject: [PATCH 2/2] CC-3050: Comb through source code for dates being generated with date() function -done --- .../controllers/NowplayingController.php | 3 +-- .../application/controllers/ScheduleController.php | 5 +++-- airtime_mvc/application/models/DateHelper.php | 14 ++++++-------- airtime_mvc/application/models/Nowplaying.php | 2 +- airtime_mvc/application/models/Preference.php | 6 +++--- airtime_mvc/application/models/Show.php | 4 ++-- airtime_mvc/application/models/ShowInstance.php | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php index 4b9e0430f..0cf0a3850 100644 --- a/airtime_mvc/application/controllers/NowplayingController.php +++ b/airtime_mvc/application/controllers/NowplayingController.php @@ -112,8 +112,7 @@ class NowplayingController extends Zend_Controller_Action { // unset session Zend_Session::namespaceUnset('referrer'); - $now = date("Y-m-d H:i:s"); - Application_Model_Preference::SetRemindMeDate($now); + Application_Model_Preference::SetRemindMeDate(); die(); } diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index f45ae2b9e..3896aa594 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -435,10 +435,11 @@ class ScheduleController extends Zend_Controller_Action //convert from UTC to user's timezone for display. $originalDateTime = new DateTime($originalShowStart, new DateTimeZone("UTC")); - $timestamp = strtotime(Application_Model_DateHelper::ConvertToLocalDateTimeString($originalDateTime->format("Y-m-d H:i:s"))); + $originalDateTime->setTimezone(new DateTimeZone(date_default_timezone_get)); + //$timestamp = Application_Model_DateHelper::ConvertToLocalDateTimeString($originalDateTime->format("Y-m-d H:i:s")); $this->view->additionalShowInfo = "Rebroadcast of show \"$originalShowName\" from " - .date("l, F jS", $timestamp)." at ".date("G:i", $timestamp); + .$originalDateTime->format("l, F jS")." at ".$originalDateTime->format("G:i"); } $this->view->showContent = $show->getShowListContent(); $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml'); diff --git a/airtime_mvc/application/models/DateHelper.php b/airtime_mvc/application/models/DateHelper.php index 98ec49573..9fe400f79 100644 --- a/airtime_mvc/application/models/DateHelper.php +++ b/airtime_mvc/application/models/DateHelper.php @@ -24,10 +24,7 @@ class Application_Model_DateHelper */ function getUtcTimestamp() { - $dateTime = new DateTime("@".$this->_dateTime); - $dateTime->setTimezone(new DateTimeZone("UTC")); - - return $dateTime->format("Y-m-d H:i:s"); + return gmdate("Y-m-d H:i:s", $this->_dateTime); } /** @@ -36,7 +33,7 @@ class Application_Model_DateHelper */ function getDate() { - return date("Y-m-d", $this->_dateTime); + return gmdate("Y-m-d", $this->_dateTime); } /** @@ -45,7 +42,7 @@ class Application_Model_DateHelper */ function getTime() { - return date("H:i:s", $this->_dateTime); + return gmdate("H:i:s", $this->_dateTime); } /** @@ -53,7 +50,8 @@ class Application_Model_DateHelper */ function setDate($dateString) { - $this->_dateTime = strtotime($dateString); + $dateTime = new DateTime($dateString, new DateTimeZone("UTC")); + $this->_dateTime = $dateTime->getTimestamp(); } /** @@ -66,7 +64,7 @@ class Application_Model_DateHelper * @return End of day timestamp in local timezone */ function getDayEndTimestamp() { - $dateTime = new DateTime($this->getDate()); + $dateTime = new DateTime($this->getDate(), new DateTimeZone("UTC")); $dateTime->add(new DateInterval('P1D')); return $dateTime->format('Y-m-d H:i:s'); } diff --git a/airtime_mvc/application/models/Nowplaying.php b/airtime_mvc/application/models/Nowplaying.php index 88540d867..b59bb4e6a 100644 --- a/airtime_mvc/application/models/Nowplaying.php +++ b/airtime_mvc/application/models/Nowplaying.php @@ -107,7 +107,7 @@ class Application_Model_Nowplaying } public static function ShouldShowPopUp(){ - $today = mktime(0, 0, 0, date("m") , date("d"), date("Y")); + $today = mktime(0, 0, 0, gmdate("m"), gmdate("d"), gmdate("Y")); $remindDate = Application_Model_Preference::GetRemindMeDate(); if($remindDate == NULL || $today >= $remindDate){ return true; diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index d76b4e9fc..e856681f0 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -383,7 +383,7 @@ class Application_Model_Preference $outputArray['NUM_OF_SONGS'] = Application_Model_StoredFile::getFileCount(); $outputArray['NUM_OF_PLAYLISTS'] = Application_Model_Playlist::getPlaylistCount(); $outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Application_Model_Schedule::getSchduledPlaylistCount(); - $outputArray['NUM_OF_PAST_SHOWS'] = Application_Model_ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s")); + $outputArray['NUM_OF_PAST_SHOWS'] = Application_Model_ShowInstance::GetShowInstanceCount(gmdate("Y-m-d H:i:s")); $outputArray['UNIQUE_ID'] = self::GetUniqueId(); $outputArray['SAAS'] = self::GetPlanLevel(); $outputArray['INSTALL_METHOD'] = self::GetInstallMethod(); @@ -422,8 +422,8 @@ class Application_Model_Preference } } - public static function SetRemindMeDate($now){ - $weekAfter = mktime(0, 0, 0, date("m") , date("d")+7, date("Y")); + public static function SetRemindMeDate(){ + $weekAfter = mktime(0, 0, 0, gmdate("m"), gmdate("d")+7, gmdate("Y")); self::SetValue("remindme", $weekAfter); } diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 1611b273e..6c6e25d15 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -845,7 +845,7 @@ class Application_Model_Show { //What we are doing here is checking if the show repeats or if //any repeating days have been checked. If not, then by default //the "selected" DOW is the initial day. - $startDow = date("w", $utcStartDateTime->getTimestamp()); + $startDow = gmdate("w", $utcStartDateTime->getTimestamp()); if (!$data['add_show_repeats']) { $data['add_show_day_check'] = array($startDow); } else if ($data['add_show_repeats'] && $data['add_show_day_check'] == "") { @@ -1372,7 +1372,7 @@ class Application_Model_Show { $shows = Application_Model_Show::getShows($start, $end); - $today_timestamp = Application_Model_DateHelper::ConvertToUtcDateTime(date("Y-m-d H:i:s"))->format("Y-m-d H:i:s"); + $today_timestamp = gmdate("Y-m-d H:i:s"); foreach ($shows as $show) { $options = array(); diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 614116187..f7eb5166f 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -256,7 +256,7 @@ class Application_Model_ShowInstance { $mins = abs($deltaMin%60); - $today_timestamp = Application_Model_DateHelper::ConvertToUtcDateTime(date("Y-m-d H:i:s"))->format("Y-m-d H:i:s"); + $today_timestamp = gmdate("Y-m-d H:i:s"); $starts = $this->getShowInstanceStart(); $ends = $this->getShowInstanceEnd();