From b5e72d673f5d6fb71a4f98a0616804b16e0bcad0 Mon Sep 17 00:00:00 2001 From: drigato Date: Tue, 2 Jun 2015 09:48:43 -0400 Subject: [PATCH 1/4] Next track in dashboard was wrong sometimes Was not filtering by playout_status --- airtime_mvc/application/models/Schedule.php | 1 + 1 file changed, 1 insertion(+) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 75123e5d3..56b25e207 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/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)) { From dd4cbe5b63f81c7219a17d0e28a1b32b059c2713 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 5 Jun 2015 11:52:51 -0400 Subject: [PATCH 2/4] CC-6051 - Route / generates invalid navigation bar links --- airtime_mvc/application/controllers/IndexController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index 232623bc9..58f484c7e 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -10,7 +10,7 @@ class IndexController extends Zend_Controller_Action public function indexAction() { - $this->_forward('index', 'showbuilder'); + $this->_redirect('Showbuilder'); } public function mainAction() From ada6b97873dbca0a0972d9a3bde24c9e10c3c70a Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 5 Jun 2015 12:34:51 -0400 Subject: [PATCH 3/4] CC-6050: User management bugfix --- airtime_mvc/application/controllers/UserController.php | 1 - airtime_mvc/application/models/User.php | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index 4c3168f80..45005fc9a 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -102,7 +102,6 @@ class UserController extends Zend_Controller_Action public function getHostsAction() { $search = $this->_getParam('term'); - $res = Application_Model_User::getHosts($search); $this->view->hosts = Application_Model_User::getHosts($search); } diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index ac428fefc..76e563155 100644 --- a/airtime_mvc/application/models/User.php +++ b/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"; From fb1fc6fb00bf4990da8c50a4e1bc973e1c6cc72c Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Tue, 9 Jun 2015 17:14:33 -0400 Subject: [PATCH 4/4] CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers --- airtime_mvc/application/models/StreamSetting.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index 688ddc397..391ae7dbb 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/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"]