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

airtime_mvc/application/controllers/ApiController.php

@@ -632,7 +632,7 @@ class ApiController extends Zend_Controller_Action
         $all    = $request->getParam('all');
 
         $this->view->files =
-            Application_Model_StoredFile::listAllFiles($dir_id,$all);
+            Application_Model_StoredFile::listAllFiles($dir_id, $all);
     }
 
     public function listAllWatchedDirsAction()
@@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action
                     $watchDir = Application_Model_MusicDir::getDirByPath($rd);
                     // get all the files that is under $dirPath
                     $files = Application_Model_StoredFile::listAllFiles(
-                        $dir->getId(),$all=false, true);
+                        $dir->getId(),$all=false);
                     foreach ($files as $f) {
                         // if the file is from this mount
                         if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {

airtime_mvc/application/models/ListenerStat.php

@@ -46,7 +46,25 @@ SQL;
                 $out[$r['mount_name']][] = $r;
             }
         }
-        return $out;
+        
+        $enabledStreamIds = Application_Model_StreamSetting::getEnabledStreamIds();
+        $enabledOut = array();
+        
+        foreach ($enabledStreamIds as $sId) {
+        	
+        	$sql = "SELECT value FROM cc_stream_setting"
+        	." WHERE keyname = :key";
+        	
+        	$result = Application_Common_Database::prepareAndExecute($sql, array('key' => $sId."_mount"), "single");
+        	
+        	$enabledMountPoint = $result["value"];
+        	
+        	if (isset($out[$enabledMountPoint])) {
+        		$enabledOut[$enabledMountPoint] = $out[$enabledMountPoint];
+        	}
+        }
+        
+        return $enabledOut;
     }
 
     public static function insertDataPoints($p_dataPoints) {

airtime_mvc/application/models/MusicDir.php

@@ -195,7 +195,7 @@ SQL;
 
         $exist_dir = self::getDirByPath($p_path);
 
-        if ($exist_dir == NULL) {
+        if (is_null($exist_dir)) {
             $temp_dir = new CcMusicDirs();
             $dir = new Application_Model_MusicDir($temp_dir);
         } else {
@@ -228,7 +228,12 @@ SQL;
             return array("code"=>1, "error"=>"$msg");
         } catch (Exception $e) {
             return array("code"=>1,
-                         "error"=>sprintf(_("%s is already set as the current storage dir or in the watched folders list"), $p_path));
+                "error" => sprintf(
+                    _("%s is already set as the current storage dir or in the".
+                        " watched folders list"), 
+                    $p_path
+                )
+            );
         }
 
     }

airtime_mvc/application/models/StoredFile.php

@@ -1071,7 +1071,7 @@ SQL;
      * @param $dir_id - if this is not provided, it returns all files with full
      * path constructed.
      */
-    public static function listAllFiles($dir_id=null, $all)
+    public static function listAllFiles($dir_id=null, $all=true)
     {
         $con = Propel::getConnection();
 
@@ -1081,10 +1081,6 @@ FROM CC_FILES AS f
 WHERE f.directory = :dir_id
 SQL;
 
-        # TODO : the option $all is deprecated now and is always true.
-        # refactor code where it's still being passed
-        $all = true;
-                
         if (!$all) {
             $sql .= " AND f.file_exists = 'TRUE'";
         }

airtime_mvc/application/models/StreamSetting.php

@@ -284,6 +284,7 @@ class Application_Model_StreamSetting
         $con = Propel::getConnection();
 
         $update_time = Application_Model_Preference::GetStreamUpdateTimestemp();
+        
         if ($boot_time == null || $boot_time > $update_time) {
             $keyname = "s".$stream_id."_liquidsoap_error";
             $sql = "SELECT COUNT(*) FROM cc_stream_setting"
@@ -468,7 +469,18 @@ class Application_Model_StreamSetting
     
     public static function GetAllListenerStatErrors(){
     	$sql = "SELECT * FROM cc_stream_setting WHERE keyname like :p1";
-        return Application_Common_Database::prepareAndExecute($sql, array(':p1'=>'%_listener_stat_error'));
+    	$mounts =  Application_Common_Database::prepareAndExecute($sql, array(':p1'=>'%_mount'));
+    	
+    	$mps = array();
+    	
+    	foreach($mounts as $mount) {
+    		$mps[] = "'" .$mount["value"] . "_listener_stat_error'";
+    	}
+    	
+    	$in = implode(",", $mps);
+    	
+        $sql = "SELECT * FROM cc_stream_setting WHERE keyname IN ( $in )";
+        return Application_Common_Database::prepareAndExecute($sql, array());
     }
     
     public static function SetListenerStatError($key, $v) {