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

CC-2833: Use ClassLoaders for PHP Files

Browse source 
-Done for class Schedule and ScheduleGroup
This commit is contained in:
martin 2011-09-23 16:50:00 -04:00
parent cd95170b06
commit 1e9a8a28fe
13 changed files with 264 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,7 +219,7 @@ class ApiController extends Zend_Controller_Action
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
$result = Schedule::GetScheduledPlaylists();
$result = Application_Model_Schedule::GetScheduledPlaylists();
echo json_encode($result);
}
@ -241,7 +241,7 @@ class ApiController extends Zend_Controller_Action
$schedule_group_id = $this->_getParam("schedule_id");
$media_id = $this->_getParam("media_id");
$result = Schedule::UpdateMediaPlayedStatus($media_id);
$result = Application_Model_Schedule::UpdateMediaPlayedStatus($media_id);
if (!PEAR::isError($result)) {
echo json_encode(array("status"=>1, "message"=>""));
@ -270,7 +270,7 @@ class ApiController extends Zend_Controller_Action
$schedule_group_id = $this->_getParam("schedule_id");
if (is_numeric($schedule_group_id)) {
$sg = new ScheduleGroup($schedule_group_id);
$sg = new Application_Model_ScheduleGroup($schedule_group_id);
if ($sg->exists()) {
$result = $sg->notifyGroupStartPlay();
if (!PEAR::isError($result)) {

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

@ -55,7 +55,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/qtip/jquery.qtip.min.css');
Schedule::createNewFormSections($this->view);
Application_Model_Schedule::createNewFormSections($this->view);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new User($userInfo->id);
@ -252,7 +252,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction()
{
$this->view->entries = Schedule::GetPlayOrderRange();
$this->view->entries = Application_Model_Schedule::GetPlayOrderRange();
}
public function findPlaylistsAction()
@ -482,7 +482,7 @@ class ScheduleController extends Zend_Controller_Action
}
public function getFormAction(){
Schedule::createNewFormSections($this->view);
Application_Model_Schedule::createNewFormSections($this->view);
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
}
@ -631,7 +631,7 @@ class ScheduleController extends Zend_Controller_Action
}
//send back a new form for the user.
Schedule::createNewFormSections($this->view);
Application_Model_Schedule::createNewFormSections($this->view);
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
}
@ -643,7 +643,7 @@ class ScheduleController extends Zend_Controller_Action
}
//send back a new form for the user.
Schedule::createNewFormSections($this->view);
Application_Model_Schedule::createNewFormSections($this->view);
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
}

2
airtime_mvc/application/controllers/plugins/RabbitMqPlugin.php
View file

@ -5,7 +5,7 @@ class RabbitMqPlugin extends Zend_Controller_Plugin_Abstract
public function dispatchLoopShutdown()
{
if (RabbitMq::$doPush) {
$md = array('schedule' => Schedule::GetScheduledPlaylists());
$md = array('schedule' => Application_Model_Schedule::GetScheduledPlaylists());
RabbitMq::SendMessageToPypo("update_schedule", $md);
RabbitMq::SendMessageToShowRecorder("update_schedule");
}