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

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source 
Conflicts:
	application/models/Shows.php
This commit is contained in:
paul.baranowski 2011-03-22 10:00:37 -04:00
commit b650abcbb8
24 changed files with 446 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

13
application/controllers/ApiController.php
View file

@ -101,6 +101,19 @@ class ApiController extends Zend_Controller_Action
exit;
}
public function liveInfoAction(){
global $CC_CONFIG;
// disable the view and the layout
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
$result = Schedule::GetPlayOrderRange(0, 1);
//echo json_encode($result);
header("Content-type: text/javascript");
echo $_GET['callback'].'('.json_encode($result).')';
}
public function scheduleAction()
{
global $CC_CONFIG;