diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index e9e93fe44..ebb5acbf6 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -35,17 +35,6 @@ class WebstreamController extends Zend_Controller_Action $webstream->setDbUtime(new DateTime("now", new DateTimeZone('UTC'))); $webstream->setDbMtime(new DateTime("now", new DateTimeZone('UTC'))); - /* - $type = "stream"; - $objInfo = Application_Model_Library::getObjInfo($type); - - $obj = new $objInfo['className']($webstream); - $obj->setName($webstream->getDbName()); - $obj->setMetadata('dc:creator', $userInfo->id); - - $type = "stream"; - Application_Model_Library::changePlaylist($obj->getId(), $type); - */ //clear the session in case an old playlist was open: CC-4196 Application_Model_Library::changePlaylist(null, null); diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php index e3f08858a..561f97b12 100644 --- a/airtime_mvc/application/models/Webstream.php +++ b/airtime_mvc/application/models/Webstream.php @@ -39,7 +39,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable public function getLastModified($p_type) { - return "modified"; + return $this->webstream->getDbMtime(); } public function getDefaultLength() @@ -215,15 +215,16 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable return true; } - // TODO : properly implement this interface + // TODO : Fix this interface public function setMetadata($key, $val) { - throw new Exception("setMetadata is not imeplemented by WebStream yet"); + //This function should not be defined in the interface. + throw new Exception("Not implemented."); } public function setName($name) { - throw new Exception("setName is not imeplemented by WebStream yet"); + $this->webstream->setDbName($name); } public function setLastPlayed($timestamp) @@ -243,8 +244,6 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable //TODO: What if invalid url? $content = curl_exec($ch); - Logging::debug($content); - // close cURL resource, and free up system resources curl_close($ch);