Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

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);
 

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);
         

install_minimal/airtime-install

@@ -82,36 +82,6 @@ SCRIPT=`readlink -f $0`
 SCRIPTPATH=`dirname $SCRIPT`
 AIRTIMEROOT=$SCRIPTPATH/../
 
-#Check if required zend mvc library is present. This is a temporary workaround for 2.0.1, 
-#and we should probably create a separate file that checks whether ALL dependencies are satisfied before 
-#allowing the install to continue. However in that case, we wouldn't check for Debian packages so that we 
-#can become less Debian platform dependent in the future...
-
-set +e
-dpkg -l | grep zendframework > /dev/null 2>&1
-ZENDFRAMEWORK=$?
-
-dpkg -l | grep libzend-framework-php > /dev/null 2>&1
-LIBZEND=$?
-
-dpkg -l | grep lsof > /dev/null 2>&1
-LSOF_EXIST=$?
-
-dpkg -l | grep sudo > /dev/null 2>&1
-SUDO_EXIST=$?
-
-set -e
-
-if [ "$ZENDFRAMEWORK" != "0" -a "$LIBZEND" != "0" ]; then
-    echo "zendframework/libzend-framework-php package missing. Please run airtime-full-install"
-    exit 1
-fi
-
-if [ "$LSOF_EXIST" != "0" -o "$SUDO_EXIST" != "0" ]; then
-    echo "Packages missing. Please run airtime-full-install"
-    exit 1
-fi
-
 echo "* Making sure /etc/default/locale is set properly"
 set +e
 update-locale