diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 9bcba177d..f3bf8f561 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -13,7 +13,6 @@ require_once 'DB.php'; require_once 'Preference.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; -require_once 'soundcloud-api/Services/Soundcloud.php'; global $CC_CONFIG, $CC_DBC; $dsn = $CC_CONFIG['dsn']; diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 1adc08ae6..60cd776a8 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -367,7 +367,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 = $show_inst->getShowStart(); + $show_start_time = ConvertToLocalDateTimeString($show_inst->getShowStart()); } catch (Exception $e){ //we've reached here probably because the show was diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index 65f03539a..83e188ba4 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -78,6 +78,7 @@ class Application_Model_RabbitMq $end_timestamp = new DateTime("@".time() + 3600*2); $temp['event_type'] = $event_type; + $temp['server_timezone'] = Application_Model_Preference::GetTimezone(); if($event_type = "update_schedule"){ $temp['shows'] = Application_Model_Show::getShows($now->format("Y-m-d H:i:s"), $end_timestamp->format("Y-m-d H:i:s"), $excludeInstance=NULL, $onlyRecord=TRUE); } diff --git a/airtime_mvc/application/models/Soundcloud.php b/airtime_mvc/application/models/Soundcloud.php index c962a5646..e8f023cab 100644 --- a/airtime_mvc/application/models/Soundcloud.php +++ b/airtime_mvc/application/models/Soundcloud.php @@ -1,4 +1,5 @@