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

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

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.

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

airtime_mvc/application/views/scripts/dashboard/stream-player.phtml

@@ -1,6 +1,6 @@
 <div id="content" class="jp-container">
 <h1><? echo _("Live stream") ?></h1>
-<a id="popup-link" href="#">Share</a> 
+<a id="popup-link" href="#"><?php echo _("Share") ?></a> 
 <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
 <script>
 function setjPlayer(url, type, serverType){

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

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,

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;