Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts: application/models/Shows.php
This commit is contained in:
commit
b650abcbb8
24 changed files with 446 additions and 88 deletions
|
@ -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;
|
||||
|
|
|
@ -167,8 +167,18 @@ class PluploadController extends Zend_Controller_Action
|
|||
$upload_dir = ini_get("upload_tmp_dir");
|
||||
$file = $this->upload($upload_dir);
|
||||
|
||||
//$file->getRealFilePath();
|
||||
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().' }');
|
||||
if(Application_Model_Preference::GetDoSoundCloudUpload())
|
||||
{
|
||||
$soundcloud = new ATSoundcloud();
|
||||
$soundcloud->uploadTrack($file->getRealFilePath(), $file->getName());
|
||||
}
|
||||
|
||||
$show_instance = $this->_getParam('show_instance');
|
||||
|
||||
$show = new ShowInstance($show_instance);
|
||||
$show->setRecordedFile($file->getId());
|
||||
|
||||
die('{"jsonrpc" : "2.0", "id" : '.$file->getId().'}');
|
||||
}
|
||||
|
||||
public function pluploadAction()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue