From 19adb062cf386b0910d0e92cc3f8fedb59671523 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 19 Jun 2015 14:22:58 -0400
Subject: [PATCH 1/7] SAAS-879 and add FAQ to Help menu

* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
---
 airtime_mvc/application/configs/navigation.php        |  5 +++++
 .../application/controllers/UserController.php        |  9 +++++++--
 airtime_mvc/application/forms/EditUser.php            | 11 +++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 6f4caf71e..184b19a3f 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -133,6 +133,11 @@ $pages = array(
                 'action'     => 'help',
                 'resource'   =>    'dashboard'
             ),
+            array(
+                'label'      => _('FAQ'),
+                'uri'        => "https://sourcefabricberlin.zendesk.com/hc/en-us/sections/200994309-Airtime-FAQ",
+                'target'     => "_blank"
+            ),
             array(
                 'label'      => _('User Manual'),
                 'uri'        => "http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters",
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 4c85dc8b0..264444562 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -138,8 +138,13 @@ class UserController extends Zend_Controller_Action
                         $formData['cu_last_name'] = "admin"; //ditto, avoid non-null DB constraint
                     }
                 }
-                $user->setFirstName($formData['cu_first_name']);
-                $user->setLastName($formData['cu_last_name']);
+                if (isset($formData['cu_first_name'])) {
+                    $user->setFirstName($formData['cu_first_name']);
+                }
+
+                if (isset($formData['cu_last_name'])) {
+                    $user->setLastName($formData['cu_last_name']);
+                }
                 // We don't allow 6 x's as a password.
                 // The reason is because we use that as a password placeholder
                 // on the client side.
diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php
index a4d5dc2a6..9b8311c7e 100644
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@@ -157,10 +157,13 @@ class Application_Form_EditUser extends Zend_Form
 
     // We need to add the password identical validator here in case
     // Zend version is less than 1.10.5
-    public function isValid($data) {
-        $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
-            $data['cu_password']);
-        $this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
+    public function isValid($data)
+    {
+        if (isset($data['cu_password'])) {
+            $passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
+                $data['cu_password']);
+            $this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
+        }
         return parent::isValid($data);
     }
 }

From 1bb6ee63dc7b8d17b02883c028af1bab147e4062 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 19 Jun 2015 15:30:51 -0400
Subject: [PATCH 2/7] SAAS-867: Embedded player spins in endless loop if
 connection is refused

---
 .../views/scripts/embed/player.phtml          | 70 ++++++++++++-------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/embed/player.phtml b/airtime_mvc/application/views/scripts/embed/player.phtml
index 78baec3c8..0afe55bf9 100644
--- a/airtime_mvc/application/views/scripts/embed/player.phtml
+++ b/airtime_mvc/application/views/scripts/embed/player.phtml
@@ -8,6 +8,7 @@
     <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
 
+        var RETRY_DELAY_MSECS = 2000; //Delay before trying to reconnect to stream after an error.
         var MAX_MOBILE_SCREEN_WIDTH = 760;
 
         // We are creating a custom player object that acts as a wrapper
@@ -31,6 +32,7 @@
                 'title': 'test',
                 'bgcolor': '#FFFFFF',
                 'skin': 'mcclean',
+                'reconnectTime' : 2000, //Doesn't seem to do anything
                 'width': 180,
                 'height': 60
             };
@@ -64,21 +66,19 @@
             if (!this.flashDetect) {
 
                 MRP.html.audio.addEventListener('error', function failed(e) {
+                    var streamUrl = "";
+                    if (musesPlayer.playerMode == "auto") {
+                        var nextAvailableStream = musesPlayer.getNextAvailableStream();
+                        streamUrl = nextAvailableStream["url"];
+                    } else {
+                        streamUrl = musesPlayer.settings.url;
+                    }
+
                     switch (e.target.error.code) {
                         case e.target.error.MEDIA_ERR_NETWORK:
                             // If there is a network error keep retrying to connect
                             // to a stream.
-                            var stream;
-                            if (musesPlayer.playerMode == "auto") {
-                                var nextAvailableStream = musesPlayer.getNextAvailableStream();
-                                stream = nextAvailableStream["url"];
-                            } else {
-                                stream = musesPlayer.settings.url;
-                            }
-                            var audio = $(MRP.html.audio);
-                            audio[0].src = stream;
-                            audio[0].load();
-                            audio[0].play();
+                            musesPlayer.deferredPlay(streamUrl, RETRY_DELAY_MSECS);
                             break;
                         case e.target.error.MEDIA_ERR_DECODE:
                             // If there was a corruption error or a problem with the browser
@@ -92,11 +92,7 @@
                             // or the max number of listeners has been reached
                             // retry connection with the next available stream.
                             if (musesPlayer.playerMode == "auto") {
-                                var nextAvailableStream = musesPlayer.getNextAvailableStream();
-                                var audio = $(MRP.html.audio);
-                                audio[0].src = nextAvailableStream["url"];;
-                                audio[0].load();
-                                audio[0].play();
+                                musesPlayer.deferredPlay(nextAvailableStream["url"], RETRY_DELAY_MSECS);
                             } else {
                                 // If in manual mode and the current stream format is not supported
                                 // or the max number of listeners has been reached
@@ -179,27 +175,44 @@
             MRP.setUrl(url);
         };
 
+        /** Retry playback after a few seconds (used to throttle attempts to reconnect/play). */
+        MusesPlayer.prototype.deferredPlay = function(streamUrl, delayMSec) {
+            if (!this.flashDetect) {
+                setTimeout(function() {
+                    var audio = $(MRP.html.audio);
+                    audio[0].src = streamUrl;
+                    audio[0].load();
+                    audio[0].play();
+                }, delayMSec);
+
+            } else {
+                setTimeout(function() {
+                    musesPlayer.setURL(streamUrl);
+                    musesPlayer.play();
+                }, delayMSec);
+            }
+        };
+
         // detects errors in FLASH mode
         function musesCallback(event,value) {
             switch (event) {
                 case "ioError":
                     // problem connecting to stream
-                    var stream;
+                    var streamUrl = "";
                     if (musesPlayer.playerMode == "auto") {
-                        stream = musesPlayer.getNextAvailableStream();
-                        musesPlayer.setURL(stream["url"]);
+                        streamUrl = musesPlayer.getNextAvailableStream()["url"];
                     } else {
-                        stream = musesPlayer.settings.url;
-                        musesPlayer.setURL(stream);
+                        streamUrl = musesPlayer.settings.url;
                     }
-                    musesPlayer.play();
+
+                    //Retry playback but only after sleeping for a bit, to avoid spinning.
+                    musesPlayer.deferredPlay(streamUrl, RETRY_DELAY_MSECS);
                     break;
                 case "securityError":
                     // max listeners reached
                     if (musesPlayer.playerMode == "auto") {
                         var stream = musesPlayer.getNextAvailableStream();
-                        musesPlayer.setURL(stream["url"]);
-                        musesPlayer.play();
+                        musesPlayer.deferredPlay(stream["url"], RETRY_DELAY_MSECS);
                     } else {
                         // If in manual mode and there is a problem connecting to
                         // the stream display an error and stop play back.
@@ -275,7 +288,14 @@
                     } else {
                         var artist = data.current.name.split(" - ")[0];
                         var track = data.current.name.split(" - ")[1];
-                        $("p.now_playing").html(artist + "<span>" + track + "</span>");
+                        var nowPlayingHtml = "";
+                        if (artist) {
+                            nowPlayingHtml += artist;
+                        }
+                        if (track) {
+                            nowPlayingHtml += "<span>" + track + "</span>";
+                        }
+                        $("p.now_playing").html(nowPlayingHtml);
 
                         var current_track_end_time = new Date(data.current.ends);
                         if (current_track_end_time == "Invalid Date" || isNaN(current_track_end_time)) {

From a3f1cf1d5623ef9e15ae2615aeadf6bc702a3790 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 22 Jun 2015 10:46:29 -0400
Subject: [PATCH 3/7] CC-6060 - Fix breaking tooltips when viewing context menu
 in library

---
 .../public/js/airtime/library/library.js      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index fbe7cb5d5..4edf022ad 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -720,17 +720,19 @@ var AIRTIME = (function(AIRTIME) {
                 // icon.
                 $(nRow).find("td:not(.library_checkbox, .library_type)").qtip({
                     content: {
-                        text: $.i18n._("Loading..."),
+                        text: function(event, api) {
+                            $.get(baseUrl+"library/get-file-metadata",
+                                ({format: "html", id : aData.id, type: aData.ftype}),
+                                function (html) {
+                                    api.set('content.text', html);
+                                }, "html")
+                                .fail(function (xhr, status, error) {
+                                    api.set('content.text', status + ': ' + error)
+                                });
+                            return 'Loading...';
+                        },
                         title: {
                             text: aData.track_title
-                        },
-                        ajax: {
-                            url: baseUrl+"Library/get-file-metadata",
-                            type: "get",
-                            data: ({format: "html", id : aData.id, type: aData.ftype}),
-                            success: function(data, status) {
-                                this.set('content.text', data);
-                            }
                         }
                     },
                     position: {
@@ -753,7 +755,7 @@ var AIRTIME = (function(AIRTIME) {
                        show: function(event, api) {
                          // Only show the tooltip if it was a right-click
                          if(event.originalEvent.button !== 2) {
-                            event.preventDefault();
+                             event.preventDefault();
                          }
                        }
                     },

From 195935cccfb92dc01a78e302174ea0257b51b58e Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Mon, 22 Jun 2015 15:49:23 -0400
Subject: [PATCH 4/7] Slightly better exception handling and logging to help
 with SAAS-884

---
 python_apps/pypo/pypo/listenerstat.py | 1 +
 python_apps/pypo/pypo/pypofile.py     | 9 ++++++++-
 python_apps/pypo/pypo/pypopush.py     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/python_apps/pypo/pypo/listenerstat.py b/python_apps/pypo/pypo/listenerstat.py
index a7f99e816..fc7adc74a 100644
--- a/python_apps/pypo/pypo/listenerstat.py
+++ b/python_apps/pypo/pypo/listenerstat.py
@@ -150,6 +150,7 @@ class ListenerStat(Thread):
                 self.logger.error('Exception: %s', e)
 
             time.sleep(120)
+        self.logger.info('ListenerStat thread exiting')
 
 
 if __name__ == "__main__":
diff --git a/python_apps/pypo/pypo/pypofile.py b/python_apps/pypo/pypo/pypofile.py
index ff2103df2..157c8e1b5 100644
--- a/python_apps/pypo/pypo/pypofile.py
+++ b/python_apps/pypo/pypo/pypofile.py
@@ -5,6 +5,8 @@ from Queue import Empty
 
 import logging
 import shutil
+import time
+import traceback
 import os
 import sys
 import stat
@@ -203,5 +205,10 @@ class PypoFile(Thread):
         """
         Entry point of the thread
         """
-        self.main()
+        try: self.main()
+        except Exception, e:
+            top = traceback.format_exc()
+            self.logger.error('PypoFile Exception: %s', top)
+            time.sleep(5)
+        self.logger.info('PypoFile thread exiting')
 
diff --git a/python_apps/pypo/pypo/pypopush.py b/python_apps/pypo/pypo/pypopush.py
index 48d3cd13f..9b280bac1 100644
--- a/python_apps/pypo/pypo/pypopush.py
+++ b/python_apps/pypo/pypo/pypopush.py
@@ -153,4 +153,5 @@ class PypoPush(Thread):
                 top = traceback.format_exc()
                 self.logger.error('Pypo Push Exception: %s', top)
                 time.sleep(5)
+        self.logger.info('PypoPush thread exiting')
 

From 6fb9c6a30c4ef4c478d7accad7de963590d0ab74 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 25 Jun 2015 14:13:09 -0400
Subject: [PATCH 5/7] SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js
 widget box in preferences

---
 airtime_mvc/application/Bootstrap.php         | 87 +++++++++----------
 .../application/forms/GeneralPreferences.php  | 52 -----------
 .../application/layouts/scripts/layout.phtml  |  2 +-
 .../scripts/form/preferences_general.phtml    |  2 -
 .../airtime/audiopreview/preview_jplayer.js   |  4 +-
 .../public/js/airtime/common/common.js        |  3 +-
 6 files changed, 46 insertions(+), 104 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 578181189..37888c9ed 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -139,13 +139,14 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $view->headLink()->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/pro_dropdown_3.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/qtip/jquery.qtip.min.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/styles.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/masterpanel.css?' . $CC_CONFIG['airtime_version']);
-        $view->headLink()->appendStylesheet($baseUrl . 'css/tipsy/jquery.tipsy.css?' . $CC_CONFIG['airtime_version']);
+        $view->headLink(array('rel' => 'icon', 'href' => $baseUrl . 'favicon.ico', 'type' => 'image/x-icon'), 'PREPEND')
+            ->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/pro_dropdown_3.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/qtip/jquery.qtip.min.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/styles.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/masterpanel.css?' . $CC_CONFIG['airtime_version'])
+            ->appendStylesheet($baseUrl . 'css/tipsy/jquery.tipsy.css?' . $CC_CONFIG['airtime_version']);
     }
 
     protected function _initHeadScript()
@@ -156,22 +157,22 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $view->headScript()->appendFile($baseUrl . 'js/libs/jquery-1.8.3.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/libs/jquery-ui-1.8.24.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/bootstrap/bootstrap.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
+        $view->headScript()->appendFile($baseUrl . 'js/libs/jquery-1.8.3.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/libs/jquery-ui-1.8.24.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/bootstrap/bootstrap.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/libs/underscore-min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
 
-        $view->headScript()->appendFile($baseUrl . 'js/libs/underscore-min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
+            // ->appendFile($baseUrl . 'js/libs/jquery.stickyPanel.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/qtip/jquery.qtip.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/jplayer/jquery.jplayer.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/sprintf/sprintf-0.7-beta1.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/cookie/jquery.cookie.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/i18n/jquery.i18n.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'locale/general-translation-table?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'locale/datatables-translation-table?' . $CC_CONFIG['airtime_version'], 'text/javascript')
 
-        // $view->headScript()->appendFile($baseUrl . 'js/libs/jquery.stickyPanel.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/qtip/jquery.qtip.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/jplayer/jquery.jplayer.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/sprintf/sprintf-0.7-beta1.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/cookie/jquery.cookie.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/i18n/jquery.i18n.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'locale/general-translation-table?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'locale/datatables-translation-table?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendScript("$.i18n.setDictionary(general_dict)");
-        $view->headScript()->appendScript("var baseUrl='$baseUrl'");
+            ->appendScript("$.i18n.setDictionary(general_dict)")
+            ->appendScript("var baseUrl='$baseUrl'");
 
         //These timezones are needed to adjust javascript Date objects on the client to make sense to the user's set timezone
         //or the server's set timezone.
@@ -188,14 +189,14 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         }
 
         //scripts for now playing bar
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/airtime_bootstrap.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/dashboard/helperfunctions.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/dashboard/dashboard.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/dashboard/versiontooltip.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/tipsy/jquery.tipsy.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
+        $view->headScript()->appendFile($baseUrl . 'js/airtime/airtime_bootstrap.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/airtime/dashboard/helperfunctions.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/airtime/dashboard/dashboard.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/airtime/dashboard/versiontooltip.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/tipsy/jquery.tipsy.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
 
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/common/common.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-        $view->headScript()->appendFile($baseUrl . 'js/airtime/common/audioplaytest.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
+            ->appendFile($baseUrl . 'js/airtime/common/common.js?' . $CC_CONFIG['airtime_version'], 'text/javascript')
+            ->appendFile($baseUrl . 'js/airtime/common/audioplaytest.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
 
         $user = Application_Model_User::getCurrentUser();
         if (!is_null($user)) {
@@ -205,23 +206,19 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         }
 
         $view->headScript()->appendScript("var userType = '$userType';");
-        if (array_key_exists('REQUEST_URI', $_SERVER)) { //Doesn't exist for unit tests
-            if (strpos($_SERVER['REQUEST_URI'], $baseUrl . 'Dashboard/stream-player') === false
-                && strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/audio-preview') === false
-                && strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/playlist-preview') === false
-                && strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/block-preview') === false
-                && $_SERVER['REQUEST_URI'] != "/"
-            ) {
-                $plan_level = strval(Application_Model_Preference::GetPlanLevel());
-                // Since the Hobbyist plan doesn't come with Live Chat support, don't enable it
-                if (Application_Model_Preference::GetLiveChatEnabled() && $plan_level !== 'hobbyist') {
-                    $client_id = strval(Application_Model_Preference::GetClientId());
-                    $station_url = $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
-                    $view->headScript()->appendScript("var livechat_client_id = '$client_id';\n" .
-                        "var livechat_plan_type = '$plan_level';\n" .
-                        "var livechat_station_url = 'http://$station_url';");
-                    $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-                }
+        if (array_key_exists('REQUEST_URI', $_SERVER) //Doesn't exist for unit tests
+            && strpos($_SERVER['REQUEST_URI'], 'Dashboard/stream-player') === false
+            && strpos($_SERVER['REQUEST_URI'], 'audiopreview') === false
+            && $_SERVER['REQUEST_URI'] != "/") {
+            $plan_level = strval(Application_Model_Preference::GetPlanLevel());
+            // Since the Hobbyist plan doesn't come with Live Chat support, don't enable it
+            if (Application_Model_Preference::GetLiveChatEnabled() && $plan_level !== 'hobbyist') {
+                $client_id = strval(Application_Model_Preference::GetClientId());
+                $station_url = $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+                $view->headScript()->appendScript("var livechat_client_id = '$client_id';\n" .
+                    "var livechat_plan_type = '$plan_level';\n" .
+                    "var livechat_station_url = 'http://$station_url';");
+                $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
             }
         }
 
diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index b8a066e3e..aa2906d82 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -117,16 +117,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
                                         ));
         $this->addElement($third_party_api);
 
-        // Add the description element
-        $this->addElement('textarea', 'widgetCode', array(
-            'label' => 'Javascript Code:',
-            'required' => false,
-            'readonly' => true,
-            'style' => 'font-family: Consolas, "Liberation Mono", Courier,
-                monospace;',
-            'value' => self::getWidgetCode(),
-        ));
-
         $locale = new Zend_Form_Element_Select("locale");
         $locale->setLabel(_("Default Language"));
         $locale->setMultiOptions(Application_Model_Locale::getLocales());
@@ -148,48 +138,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         $this->addElement($week_start_day);
     }
 
-    private static function getWidgetCode() {
-        
-        $host = $_SERVER['SERVER_NAME'];
-        $code = <<<CODE
-<!-- READ THESE INSTRUCTIONS CAREFULLY:
-    Step 1 of 2: Paste these next 4 lines in the <head> section of your HTML page -->
-<script src="https://$host/widgets/js/jquery-1.6.1.min.js" type="text/javascript"></script>
-<script src="https://$host/widgets/js/jquery-ui-1.8.10.custom.min.js" type="text/javascript"></script>
-<script src="https://$host/widgets/js/jquery.showinfo.js" type="text/javascript"></script>
-<link rel="stylesheet" href="https://$host/widgets/css/airtime-widgets.css"></link>
-
-<!-- Step 2 of 2: Paste these remaining lines in the <body> section of your HTML page -->
-<div id="headerLiveHolder" style="border: 1px solid #999999; padding: 10px;"></div>
-<div id="onAirToday"></div>
-<div id="scheduleTabs"></div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-    $("#headerLiveHolder").airtimeLiveInfo({
-        sourceDomain: "http://$host",
-        updatePeriod: 20 //seconds
-    });
-
-    $("#onAirToday").airtimeShowSchedule({
-        sourceDomain: "http://$host",
-        updatePeriod: 5, //seconds
-        showLimit: 10
-    });
-
-    $("#scheduleTabs").airtimeWeekSchedule({
-        sourceDomain:"http://$host",
-        updatePeriod: 600 //seconds
-    });
-    var d = new Date().getDay();
-    $('#scheduleTabs').tabs({selected: d === 0 ? 6 : d-1, fx: { opacity: 'toggle' }});               
-});
-</script>
-CODE;
-
-        return $code;
-    }
-
     private function getWeekStartDays()
     {
         $days = array(
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index c3f5f5e2d..780a5f69e 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<?php echo $this->headTitle() ?>
+    <?php echo $this->headTitle() ?>
 	<?php echo $this->headLink() ?>
 	<?php echo $this->headScript() ?>
 	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
index de1f1c73f..614416765 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
@@ -37,7 +37,5 @@
 
         <?php echo $this->element->getElement('thirdPartyApi')->render() ?>
 
-        <?php echo $this->element->getElement('widgetCode')->render() ?>
-
     </dl>
 </fieldset>
diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
index 01badc43d..e01c2a2b3 100644
--- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
+++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
@@ -198,7 +198,7 @@ function buildplaylist(p_url, p_playIndex) {
         	width = 490;
         }
         
-        window.resizeTo(width, height);    
+        window.resizeTo(width, height);
     });
 }
 
@@ -247,6 +247,4 @@ function playOne(uri, mime) {
         _playlist_jplayer.setPlaylist(playlist);
         _playlist_jplayer.play(0);
     }
-    
-    window.resizeTo(490, 167);
 }
diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index 31f4668bf..33e1fe300 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -143,7 +143,8 @@ function open_show_preview(p_showID, p_showIndex) {
 }
 
 function openPreviewWindow(url) {
-    _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=450,height=100,scrollbars=yes');
+    // Hardcoding this here is kinda gross, but the alternatives aren't much better...
+    _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=482,height=110,scrollbars=yes');
     return false;
 }
 

From 6497bc28c5f943869f076629c4317fbb2e4451df Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 25 Jun 2015 17:43:15 -0400
Subject: [PATCH 6/7] Show collapsible sections (other than 'dangerous
 settings') by default on preferences page

---
 .../views/scripts/form/preferences.phtml      |  7 ++--
 airtime_mvc/public/css/styles.css             |  4 +-
 .../js/airtime/preferences/preferences.js     | 39 +------------------
 3 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml
index d200bf627..b5b96cb55 100644
--- a/airtime_mvc/application/views/scripts/form/preferences.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences.phtml
@@ -9,10 +9,11 @@
     </div>
 
 
-    <?php //No soundcloud stuff on Airtime Pro -- Albert ?>
+    <!-- No soundcloud stuff on Airtime Pro -- Albert -->
 
-    <h3 class="collapsible-header" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
-    <div class="collapsible-content" id="dangerous-settings">
+    <!-- Hide the 'dangerous settings' by default -->
+    <h3 class="collapsible-header closed" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
+    <div class="collapsible-content" id="dangerous-settings" style="display:none;">
         <?php echo $this->element->getSubform('preferences_danger') ?>
     </div>
 
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 35a8ce343..dac82da55 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1841,7 +1841,6 @@ span.errors.sp-errors{
 }
 .collapsible-content {
     margin-top:-1px;
-    display:none;
 }
 .collapsible-header .arrow-icon, .collapsible-header-disabled  .arrow-icon {
     display:block;
@@ -1853,9 +1852,8 @@ span.errors.sp-errors{
     top:8px;
     
 }
-.collapsible-header.closed .arrow-icon, collapsible-header-disabled.close  .arrow-icon {
+.collapsible-header.closed .arrow-icon, .collapsible-header-disabled.close  .arrow-icon {
     background-position: 0 -11px !important;
-    
 }
 #schedule-add-show .button-bar {
     height: 28px;
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 252a64a99..aeb6e27e7 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -99,41 +99,6 @@ function setMsAuthenticationFieldsReadonly(ele) {
     }
 }
 
-function setCollapsibleWidgetJsCode() {
-    var x = function() {
-        var val = $('input:radio[name=thirdPartyApi]:checked').val();
-        if (val == "1") {
-            //show js textarea
-            $('#widgetCode-label').show("fast");
-            $('#widgetCode-element').show("fast");
-        } else {
-            if ($('#widgetCode-label').is(":visible")) {
-                //hide js textarea
-                $('#widgetCode-label').hide();
-                $('#widgetCode-element').hide();
-            }
-        }
-    }
-    x();
-    $('#thirdPartyApi-element input').click(x);
-}
-
-function setSoundCloudCheckBoxListener() {
-    var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption");
-    var mainCheckBox= $("#UploadToSoundcloudOption");
-    subCheckBox.change(function(e){
-        if (subCheckBox.is(':checked')) {
-            mainCheckBox.attr("checked", true);
-        }
-    });
-
-    mainCheckBox.change(function(e){
-         if (!mainCheckBox.is(':checked')) {
-            $("#UseSoundCloud,#SoundCloudDownloadbleOption").attr("checked", false);
-        }   
-    });
-}
-
 function removeLogo() {
     $.post(baseUrl+'Preference/remove-logo', function(json){});
     location.reload();
@@ -153,7 +118,7 @@ $(document).ready(function() {
         $(this).next().toggle('fast');
         $(this).toggleClass("closed");
         return false;
-    }).next().hide();
+    });
 
     if ($("#tunein-settings").find(".errors").length > 0) {
         $(".collapsible-content#tunein-settings").show();
@@ -176,12 +141,10 @@ $(document).ready(function() {
 
     showErrorSections();
     
-    setSoundCloudCheckBoxListener();
     setMailServerInputReadonly();
     setSystemFromEmailReadonly();
     setConfigureMailServerListener();
     setEnableSystemEmailsListener();
-    setCollapsibleWidgetJsCode();
     setTuneInSettingsReadonly();
     setTuneInSettingsListener();
 });

From c59f401eb1bc5fb09057ea4259455d92f0794d29 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 25 Jun 2015 18:21:22 -0400
Subject: [PATCH 7/7] Fix shift selection in library and builder views

---
 .../public/js/airtime/library/library.js      | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 4edf022ad..ebfd0aa0b 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -6,7 +6,9 @@ var AIRTIME = (function(AIRTIME) {
         $libTable,
         LIB_SELECTED_CLASS = "lib-selected",
         chosenItems = {},
-        visibleChosenItems = {};
+        visibleChosenItems = {},
+        $previouslySelected;
+
 
     // we need to know whether the criteria value is string or
     // numeric in order to provide a single textbox or range textboxes
@@ -868,28 +870,35 @@ var AIRTIME = (function(AIRTIME) {
             });
         
         $libTable.find("tbody").on("click", "input[type=checkbox]", function(ev) {
-            
+
             var $cb = $(this),
-                $prev,
                 $tr = $cb.parents("tr"),
-                $trs;
-            
+                // Get the ID of the selected row
+                $rowId = $tr.attr("id");
+
             if ($cb.is(":checked")) {
-                
-                if (ev.shiftKey) {
-                    $prev = $libTable.find("tbody").find("tr."+LIB_SELECTED_CLASS).eq(-1);
-                    $trs = $prev.nextUntil($tr);
-                    
-                    $trs.each(function(i, el){
-                        mod.selectItem($(el));
-                    });
+                if (ev.shiftKey && $previouslySelected !== undefined) {
+                    // If the selected row comes before the previously selected row,
+                    // we want to select previous rows, otherwise we select next
+                    if ($previouslySelected.prevAll("#"+$rowId).length !== 0) {
+                        $previouslySelected.prevUntil($tr).each(function(i, el){
+                            mod.selectItem($(el));
+                        });
+                    } else {
+                        $previouslySelected.nextUntil($tr).each(function(i, el){
+                            mod.selectItem($(el));
+                        });
+                    }
                 }
 
                 mod.selectItem($tr);
+                // Remember this row so we can properly multiselect
+                $previouslySelected = $tr;
             }
             else {
-                mod.deselectItem($tr);  
+                mod.deselectItem($tr);
             }
+            
         });
        
         checkImportStatus();