CC-5594 : Remove all date_default_timezone_get()

simplifying code, removing unnecessary calculations.
This commit is contained in:
Naomi 2013-12-04 16:05:18 -05:00
parent e508d141ed
commit 20b32bab80
1 changed files with 9 additions and 10 deletions

View File

@ -435,22 +435,21 @@ class ApiController extends Zend_Controller_Action
public function recordedShowsAction() public function recordedShowsAction()
{ {
$today_timestamp = date("Y-m-d H:i:s"); $utcTimezone = new DateTimeZone("UTC");
$now = new DateTime($today_timestamp); $nowDateTime = new DateTime("now", $utcTimezone);
$end_timestamp = $now->add(new DateInterval("PT2H")); $endDateTime = clone $nowDateTime;
$end_timestamp = $end_timestamp->format("Y-m-d H:i:s"); $endDateTime = $endDateTime->add(new DateInterval("PT2H"));
$this->view->shows = $this->view->shows =
Application_Model_Show::getShows( Application_Model_Show::getShows(
Application_Common_DateHelper::ConvertToUtcDateTime($today_timestamp, date_default_timezone_get()), $nowDateTime,
Application_Common_DateHelper::ConvertToUtcDateTime($end_timestamp, date_default_timezone_get()), $endDateTime,
$onlyRecord = true); $onlyRecord = true);
$this->view->is_recording = false; $this->view->is_recording = false;
$this->view->server_timezone = Application_Model_Preference::GetTimezone(); $this->view->server_timezone = Application_Model_Preference::GetDefaultTimezone();
$rows = Application_Model_Show::getCurrentShow($today_timestamp); $rows = Application_Model_Show::getCurrentShow();
Application_Model_Show::convertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp"));
if (count($rows) > 0) { if (count($rows) > 0) {
$this->view->is_recording = ($rows[0]['record'] == 1); $this->view->is_recording = ($rows[0]['record'] == 1);