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

CC-1665: Scheduled stream rebroadcasting and recording 

-fixed syntax error
This commit is contained in:
Martin Konecny 2012-08-22 15:56:18 -04:00
parent 8573dcb870
commit fe1aa7a169
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/LibraryController.php
View File

@ -55,11 +55,10 @@ class LibraryController extends Zend_Controller_Action
try { try {
$obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
//Application_Model_Library::changePlaylist(null, null);
if (isset($obj_sess->id)) { if (isset($obj_sess->id)) {
Logging::info($obj_sess->type);
$objInfo = Application_Model_Library::getObjInfo($this->obj_sess->type);
Logging::info($obj_sess->id); Logging::info($obj_sess->id);
Logging::info($obj_sess->type);
$objInfo = Application_Model_Library::getObjInfo($obj_sess->type);
$obj = new $objInfo['className']($obj_sess->id); $obj = new $objInfo['className']($obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);
@ -82,6 +81,7 @@ class LibraryController extends Zend_Controller_Action
$this->playlistNotFound($obj_sess->type); $this->playlistNotFound($obj_sess->type);
} catch (Exception $e) { } catch (Exception $e) {
$this->playlistNotFound($obj_sess->type); $this->playlistNotFound($obj_sess->type);
Logging::info($e->getMessage());
//$this->playlistUnknownError($e); //$this->playlistUnknownError($e);
} }
} }

3
airtime_mvc/application/models/Library.php
View File

@ -13,6 +13,8 @@ class Application_Model_Library
$info['className'] = 'Application_Model_Block'; $info['className'] = 'Application_Model_Block';
} else if (strcmp($p_type, 'stream')==0) { } else if (strcmp($p_type, 'stream')==0) {
$info['className'] = 'Application_Model_Webstream'; $info['className'] = 'Application_Model_Webstream';
} else {
throw new Exception("Unknown object type: '$p_type'");
} }
return $info; return $info;
@ -21,7 +23,6 @@ class Application_Model_Library
public static function changePlaylist($p_id, $p_type) public static function changePlaylist($p_id, $p_type)
{ {
$obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
Logging::info($obj_sess);
if (is_null($p_id) || is_null($p_type)) { if (is_null($p_id) || is_null($p_type)) {
unset($obj_sess->id); unset($obj_sess->id);