Merge branch 'saas-dev' into saas-installer-albert

airtime_mvc/application/models/Schedule.php

@@ -268,6 +268,7 @@ SQL;
         $nextMedia = CcScheduleQuery::create()
             ->filterByDbStarts($currentMedia["starts"], Criteria::GREATER_THAN)
             ->filterByDbId($currentMedia["id"], Criteria::NOT_EQUAL)
+            ->filterByDbPlayoutStatus(0, Criteria::GREATER_THAN)
             ->orderByDbStarts(Criteria::ASC)
             ->findOne();
         if (isset($nextMedia)) {

airtime_mvc/application/models/Show.php

@@ -1157,13 +1157,13 @@ WHERE si.show_id = s.id
   AND si.starts >= :timeNow::timestamp - INTERVAL '2 days'
   AND si.starts < :timeEnd::timestamp
   AND modified_instance != TRUE
-ORDER BY 
-  CASE 
+ORDER BY
+  CASE
     WHEN si.ends > :timeNow::timestamp
       AND  si.starts < :timeNow::timestamp THEN 1
     WHEN si.starts > :timeNow::timestamp THEN 2
     ELSE 3
-  END
+  END, si.starts
 LIMIT :lim
 SQL;
 

airtime_mvc/application/models/StreamSetting.php

@@ -75,8 +75,13 @@ class Application_Model_StreamSetting
             $host = $streamData[$prefix."host"];
             $port = $streamData[$prefix."port"];
             $mount = $streamData[$prefix."mount"];
+            if ($streamData[$prefix."output"] == "shoutcast") {
+                $url = "http://$host:$port/";
+            } else { //Icecast
+                $url = "http://$host:$port/$mount";
+            }
             $streams[$id] = Array(
-                "url" => "http://$host:$port/$mount",
+                "url" => $url,
                 "codec" => $streamData[$prefix."type"],
                 "bitrate" => $streamData[$prefix."bitrate"],
                 "mobile" => $streamData[$prefix."mobile"]

airtime_mvc/application/models/User.php

@@ -282,7 +282,6 @@ class Application_Model_User
         $con     = Propel::getConnection();
 
         $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
-        $sql     = $sql_gen;
 
         $types = array();
         $params = array();
@@ -296,13 +295,8 @@ class Application_Model_User
 
         $sql      = $sql_gen ." WHERE (". $sql_type.") ";
 
-        if (!is_null($search)) {
-            //need to use addslashes for 'LIKE' values
-            $search = addslashes($search);
-            $like = "login ILIKE '%{$search}%'";
-
-            $sql  = $sql . " AND ".$like;
-        }
+        $sql .= " AND login ILIKE :search";
+        $params[":search"] = "%$search%";
 
         $sql = $sql ." ORDER BY login";