Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' into soundcloud

Browse source 
Conflicts:
	airtime_mvc/application/configs/constants.php
This commit is contained in:
Duncan Sommerville 2015-06-29 10:02:58 -04:00
commit 5cc8774e56
30 changed files with 194 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -170,7 +170,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$utcTimeNow = gmdate("Y-m-d H:i:s");
$utcTimeNow = gmdate(DEFAULT_TIMESTAMP_FORMAT);
$utcTimeEnd = ""; // if empty, getNextShows will use interval instead of end of day
// default to the station timezone
@ -192,7 +192,7 @@ class ApiController extends Zend_Controller_Action
// make getNextShows use end of day
$end = Application_Common_DateHelper::getTodayStationEndDateTime();
$end->setTimezone(new DateTimeZone("UTC"));
$utcTimeEnd = $end->format("Y-m-d H:i:s");
$utcTimeEnd = $end->format(DEFAULT_TIMESTAMP_FORMAT);
$result = array(
"env" => APPLICATION_ENV,

3
airtime_mvc/application/controllers/ListenerstatController.php
View file

@ -57,7 +57,8 @@ class ListenerstatController extends Zend_Controller_Action
public function getDataAction(){
list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());
$data = Application_Model_ListenerStat::getDataPointsWithinRange($startsDT->format("Y-m-d H:i:s"), $endsDT->format("Y-m-d H:i:s"));
$data = Application_Model_ListenerStat::getDataPointsWithinRange($startsDT->format(DEFAULT_TIMESTAMP_FORMAT),
$endsDT->format(DEFAULT_TIMESTAMP_FORMAT));
$this->_helper->json->sendJson($data);
}
}

2
airtime_mvc/application/controllers/PluploadController.php
View file

@ -103,7 +103,7 @@ class PluploadController extends Zend_Controller_Action
//TODO: $this->sanitizeResponse($upload));
$upload['utime'] = new DateTime($upload['utime'], $utcTimezone);
$upload['utime']->setTimeZone($displayTimezone);
$upload['utime'] = $upload['utime']->format('Y-m-d H:i:s');
$upload['utime'] = $upload['utime']->format(DEFAULT_TIMESTAMP_FORMAT);
//TODO: Invoke sanitization here (MediaController's removeBlacklist stuff)
array_push($uploadsArray, $upload);

2
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -500,7 +500,7 @@ class PreferenceController extends Zend_Controller_Action
$utcTimezone = new DateTimeZone("UTC");
$nowDateTime = new DateTime("now", $utcTimezone);
$scheduleItems = CcScheduleQuery::create()
->filterByDbEnds($nowDateTime->format("Y-m-d H:i:s"), Criteria::GREATER_THAN)
->filterByDbEnds($nowDateTime->format(DEFAULT_TIMESTAMP_FORMAT), Criteria::GREATER_THAN)
->find();
// Delete all the schedule items

4
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -236,8 +236,8 @@ class ShowbuilderController extends Zend_Controller_Action
$end->setTimezone($displayTimeZone);
$show_name = $instance->getCcShow()->getDbName();
$start_time = $start->format("Y-m-d H:i:s");
$end_time = $end->format("Y-m-d H:i:s");
$start_time = $start->format(DEFAULT_TIMESTAMP_FORMAT);
$end_time = $end->format(DEFAULT_TIMESTAMP_FORMAT);
$this->view->title = "{$show_name}: {$start_time} - {$end_time}";
$this->view->start = $start_time;