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

CC-4348: Prepared statements - part 4

Browse source 
-fixed Show.php
This commit is contained in:
Martin Konecny 2012-09-04 13:12:35 -04:00
parent 8e40137b7d
commit a731fc147b
4 changed files with 95 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,7 +382,7 @@ class ApiController extends Zend_Controller_Action
$this->view->is_recording = false;
$this->view->server_timezone = Application_Model_Preference::GetTimezone();
$rows = Application_Model_Show::GetCurrentShow($today_timestamp);
$rows = Application_Model_Show::getCurrentShow($today_timestamp);
Application_Model_Show::convertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp"));
if (count($rows) > 0) {
@ -928,7 +928,7 @@ class ApiController extends Zend_Controller_Action
}
} elseif ($djtype == "dj") {
//check against show dj auth
$showInfo = Application_Model_Show::GetCurrentShow();
$showInfo = Application_Model_Show::getCurrentShow();
// there is current playing show
if (isset($showInfo[0]['id'])) {
$current_show_id = $showInfo[0]['id'];

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

@ -24,7 +24,7 @@ class DashboardController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
$show = Application_Model_Show::GetCurrentShow();
$show = Application_Model_Show::getCurrentShow();
$show_id = isset($show['id'])?$show['id']:0;
@ -51,7 +51,7 @@ class DashboardController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
$show = Application_Model_Show::GetCurrentShow();
$show = Application_Model_Show::getCurrentShow();
$show_id = isset($show[0]['id'])?$show[0]['id']:0;
$source_connected = Application_Model_Preference::GetSourceStatus($sourcename);

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

@ -121,7 +121,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentShowAction()
{
$currentShow = Application_Model_Show::GetCurrentShow();
$currentShow = Application_Model_Show::getCurrentShow();
if (!empty($currentShow)) {
$this->view->si_id = $currentShow[0]["instance_id"];
$this->view->current_show = true;
@ -346,7 +346,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction()
{
$range = Application_Model_Schedule::GetPlayOrderRange();
$show = Application_Model_Show::GetCurrentShow();
$show = Application_Model_Show::getCurrentShow();
/* Convert all UTC times to localtime before sending back to user. */
if (isset($range["previous"])) {