From 4fe9fc189a4694bd16a545fac979ccd988a7dd64 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 9 Apr 2014 14:57:30 -0400 Subject: [PATCH] CC-5709: Airtime Analyzer * CC-5772: Recent Upload table times should be shown in local time --- .../application/controllers/PluploadController.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php index 83b2fe715..0695f0def 100644 --- a/airtime_mvc/application/controllers/PluploadController.php +++ b/airtime_mvc/application/controllers/PluploadController.php @@ -60,12 +60,17 @@ class PluploadController extends Zend_Controller_Action foreach ($recentUploads as $upload) { - $upload->toArray(BasePeer::TYPE_FIELDNAME); - //array_push($uploadsArray, $upload); //TODO: $this->sanitizeResponse($upload)); + $upload = $upload->toArray(BasePeer::TYPE_FIELDNAME); + //TODO: $this->sanitizeResponse($upload)); + $utcTimezone = new DateTimeZone("UTC"); + $displayTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); + $upload['utime'] = new DateTime($upload['utime'], $utcTimezone); + $upload['utime']->setTimeZone($displayTimezone); + $upload['utime'] = $upload['utime']->format('Y-m-d H:i:s'); //$this->_helper->json->sendJson($upload->asJson()); //TODO: Invoke sanitization here - array_push($uploadsArray, $upload->toArray(BasePeer::TYPE_FIELDNAME)); + array_push($uploadsArray, $upload); }