diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php index 3ec495839..adecc3fc2 100644 --- a/airtime_mvc/application/controllers/ListenerstatController.php +++ b/airtime_mvc/application/controllers/ListenerstatController.php @@ -33,11 +33,14 @@ class ListenerstatController extends Zend_Controller_Action $now = time(); $from = $request->getParam("from", $now - (24*60*60)); $to = $request->getParam("to", $now); + + $utcTimezone = new DateTimeZone("UTC"); + $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); - $start = DateTime::createFromFormat("U", $from, new DateTimeZone("UTC")); - $start->setTimezone(new DateTimeZone(date_default_timezone_get())); - $end = DateTime::createFromFormat("U", $to, new DateTimeZone("UTC")); - $end->setTimezone(new DateTimeZone(date_default_timezone_get())); + $start = DateTime::createFromFormat("U", $from, $utcTimezone); + $start->setTimezone($displayTimeZone); + $end = DateTime::createFromFormat("U", $to, $utcTimezone); + $end->setTimezone($displayTimeZone); $form = new Application_Form_DateRange(); $form->populate(array( diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php index d28c96412..881d13acb 100644 --- a/airtime_mvc/application/controllers/PlayouthistoryController.php +++ b/airtime_mvc/application/controllers/PlayouthistoryController.php @@ -32,10 +32,13 @@ class PlayouthistoryController extends Zend_Controller_Action $from = $request->getParam("from", $now - (24*60*60)); $to = $request->getParam("to", $now); - $start = DateTime::createFromFormat("U", $from, new DateTimeZone("UTC")); - $start->setTimezone(new DateTimeZone(date_default_timezone_get())); - $end = DateTime::createFromFormat("U", $to, new DateTimeZone("UTC")); - $end->setTimezone(new DateTimeZone(date_default_timezone_get())); + $utcTimezone = new DateTimeZone("UTC"); + $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); + + $start = DateTime::createFromFormat("U", $from, $utcTimezone); + $start->setTimezone($displayTimeZone); + $end = DateTime::createFromFormat("U", $to, $utcTimezone); + $end->setTimezone($displayTimeZone); $form = new Application_Form_DateRange(); $form->populate(array( diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index ed13d68d1..8e6ad4486 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -325,9 +325,10 @@ class ScheduleController extends Zend_Controller_Action $originalShowStart = $originalShow->getShowInstanceStart(); //convert from UTC to user's timezone for display. + $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); $originalDateTime = new DateTime($originalShowStart, new DateTimeZone("UTC")); - $originalDateTime->setTimezone(new DateTimeZone(date_default_timezone_get())); - //$timestamp = Application_Common_DateHelper::ConvertToLocalDateTimeString($originalDateTime->format("Y-m-d H:i:s")); + $originalDateTime->setTimezone($displayTimeZone); + $this->view->additionalShowInfo = sprintf(_("Rebroadcast of show %s from %s at %s"), $originalShowName, diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 55b9ac9a9..9c9f2552a 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -150,11 +150,13 @@ class ShowbuilderController extends Zend_Controller_Action $from = $request->getParam("from", $now); $to = $request->getParam("to", $now + (24*60*60)); - $start = DateTime::createFromFormat("U", $from, new DateTimeZone("UTC")); - $start->setTimezone(new DateTimeZone(date_default_timezone_get())); + $utcTimezone = new DateTimeZone("UTC"); + $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); - $end = DateTime::createFromFormat("U", $to, new DateTimeZone("UTC")); - $end->setTimezone(new DateTimeZone(date_default_timezone_get())); + $start = DateTime::createFromFormat("U", $from, $utcTimezone); + $start->setTimezone($displayTimeZone); + $end = DateTime::createFromFormat("U", $to, $utcTimezone); + $end->setTimezone($displayTimeZone); $form = new Application_Form_ShowBuilder(); $form->populate(array( @@ -218,10 +220,12 @@ class ShowbuilderController extends Zend_Controller_Action return; } + $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); + $start = $instance->getDbStarts(null); - $start->setTimezone(new DateTimeZone(date_default_timezone_get())); + $start->setTimezone($displayTimeZone); $end = $instance->getDbEnds(null); - $end->setTimezone(new DateTimeZone(date_default_timezone_get())); + $end->setTimezone($displayTimeZone); $show_name = $instance->getCcShow()->getDbName(); $start_time = $start->format("Y-m-d H:i:s");