From adda497bbb552764e044797b20904ad8286b9186 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 8 Jan 2013 15:52:11 -0500 Subject: [PATCH 1/4] CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start - fixed --- airtime_mvc/application/models/StreamSetting.php | 7 ------- airtime_mvc/build/sql/defaultdata.sql | 5 ++++- python_apps/pypo/pypofetch.py | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index f7ecab761..2ea1e0830 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/airtime_mvc/application/models/StreamSetting.php @@ -201,13 +201,6 @@ class Application_Model_StreamSetting "value"=>self::getDjLiveStreamMountPoint(), "type"=>"string"); } - - $sql = "SELECT *" - ." FROM cc_pref" - ." WHERE keystr = 'off_air_meta'"; - - $out = $con->query($sql)->fetchAll(); - $rows[] = array("keyname" => $out[0]["keystr"], "value"=>$out[0]["valstr"], "type"=>"string"); return $rows; } diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql index 257d79c0f..03c59c24a 100644 --- a/airtime_mvc/build/sql/defaultdata.sql +++ b/airtime_mvc/build/sql/defaultdata.sql @@ -1,6 +1,9 @@ INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin')); -- added in 2.3 -INSERT INTO cc_pref("keystr", "valstr") VALUES('off_air_meta', 'Airtime - offline'); +INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string'); +INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_listener_stat_error', '', 'string'); +INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_listener_stat_error', '', 'string'); +INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_listener_stat_error', '', 'string'); -- end of added in 2.3 -- added in 2.1 diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 37c8d2f6c..ec3ef11ce 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -277,7 +277,7 @@ class PypoFetch(Thread): if (existing[s[u'keyname']] != str(s[u'value'])): self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname']) restart = True; - elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname']: + elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname'] or "off_air_meta" in s[u'keyname']: if (existing[s[u'keyname']] != s[u'value']): self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname']) restart = True; From 6097196dd72c1499e4de6ea274ee77616da0e515 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 8 Jan 2013 15:52:56 -0500 Subject: [PATCH 2/4] CC-4813: Users -> Do not save username on User Management page -fixed --- airtime_mvc/application/controllers/UserController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index a2abefba3..340c1a9f0 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -58,7 +58,6 @@ class UserController extends Zend_Controller_Action $user = new Application_Model_User($formData['user_id']); $user->setFirstName($formData['first_name']); $user->setLastName($formData['last_name']); - $user->setLogin($formData['login']); // We don't allow 6 x's as a password. // The reason is because we that as a password placeholder // on the client side. From 9755ea6a2044decfd8a412e751bafa39de2ebf93 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 8 Jan 2013 16:47:00 -0500 Subject: [PATCH 3/4] CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file -fixed --- airtime_mvc/application/controllers/LocaleController.php | 1 + airtime_mvc/public/js/airtime/preferences/streamsetting.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index d0e3dabd8..3fa1a0a5a 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -180,6 +180,7 @@ class LocaleController extends Zend_Controller_Action "If your live streaming client does not ask for a username, this field should be 'source'." => _("If your live streaming client does not ask for a username, this field should be 'source'."), "If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted." => _("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted."), + "This is the admin username and password for Icecast/SHOUTcast to get listener statistics." => _("This is the admin username and password for Icecast/SHOUTcast to get listener statistics."), //preferences/support-setting.js "Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"), //schedule/add-show.js diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 7fa712a58..69c76cc99 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -357,7 +357,7 @@ function setupEventListeners() { $(".admin_username_help_icon").qtip({ content: { - text: $.i18n._("This admin username and password for Icecast to get listener statistics.") + text: $.i18n._("This is the admin username and password for Icecast/SHOUTcast to get listener statistics.") }, hide: { delay: 500, From 22e4811b224fca56d52dba0ea35f361cf3c264ba Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 8 Jan 2013 16:51:11 -0500 Subject: [PATCH 4/4] Add gettext wrapper function to string missing it --- .../application/views/scripts/dashboard/stream-player.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index bee262fbd..a86c27977 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -1,6 +1,6 @@