Merge branch 'saas' into saas-store-file-size-and-hash-in-db

.gitignore

@@ -11,3 +11,4 @@ composer.phar
 /airtime_mvc/tests/test_results.xml
 /tests/results.html
 /tests/*.jar
+VERSION

airtime_mvc/application/controllers/PreferenceController.php

@@ -116,6 +116,15 @@ class PreferenceController extends Zend_Controller_Action
     {
     }
 
+    public function removeLogoAction()
+    {
+        $this->view->layout()->disableLayout();
+        // Remove reliance on .phtml files to render requests
+        $this->_helper->viewRenderer->setNoRender(true);
+
+        Application_Model_Preference::SetStationLogo("");
+    }
+
     public function streamSettingAction()
     {
         $CC_CONFIG = Config::getConfig();

airtime_mvc/application/models/Preference.php

@@ -589,13 +589,12 @@ class Application_Model_Preference
 
     public static function SetStationLogo($imagePath)
     {
-        if (!empty($imagePath)) {
-            $image = @file_get_contents($imagePath);
-            $image = base64_encode($image);
-            self::setValue("logoImage", $image);
-        } else {
-            Logging::warn("Attempting to set imagePath to empty string");
+        if (empty($imagePath)) {
+            Logging::info("Removed station logo");
         }
+        $image = @file_get_contents($imagePath);
+        $image = base64_encode($image);
+        self::setValue("logoImage", $image);
     }
 
     public static function GetStationLogo()

airtime_mvc/application/views/scripts/form/preferences_general.phtml

@@ -7,7 +7,11 @@
 
         <?php echo $this->element->getElement('stationLogo')->render() ?>
 
-        <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+        <button id="logo-remove-btn" value="Remove" class="btn">Remove</button>
+
+        <div id="Logo-img-container">
+            <img onError="this.onerror = '';this.style.visibility='hidden';$('#logo-remove-btn').hide();" id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" />
+        </div>
 
         <?php echo $this->element->getElement('locale')->render() ?>
 

airtime_mvc/public/css/styles.css

@@ -2197,6 +2197,14 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
     height: 120px;
 }
 
+.preferences #logo-remove-btn {
+    float: right;
+}
+
+.preferences #Logo-img-container {
+    float: left;
+}
+
 #show_time_info {
     font-size:12px;
     height:30px;

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -88,9 +88,11 @@ function setCollapsibleWidgetJsCode() {
             $('#widgetCode-label').show("fast");
             $('#widgetCode-element').show("fast");
         } else {
-            //hide js textarea
-            $('#widgetCode-label').hide("fast");
-            $('#widgetCode-element').hide("fast");
+            if ($('#widgetCode-label').is(":visible")) {
+                //hide js textarea
+                $('#widgetCode-label').hide();
+                $('#widgetCode-element').hide();
+            }
         }
     }
     x();
@@ -121,6 +123,10 @@ $(document).ready(function() {
         return false;
     }).next().hide();
 
+    $('#logo-remove-btn').click(function() {
+        $.post(baseUrl+'Preference/remove-logo', function(json){});
+    });
+
     /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
     $('#pref_save').live('click', function() {
         var data = $('#pref_form').serialize();

python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py

@@ -5,6 +5,12 @@ import socket
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
 
+# Fix for getaddrinfo deadlock. See these issues for details:
+# https://github.com/gevent/gevent/issues/349
+# https://github.com/docker/docker-registry/issues/400
+u'fix getaddrinfo deadlock'.encode('idna')
+
+CLOUD_CONFIG_PATH = '/etc/airtime-saas/cloud_storage.conf'
 STORAGE_BACKEND_FILE = "file"
 SOCKET_TIMEOUT = 240
 

python_apps/pypo/pypofetch.py

@@ -37,7 +37,7 @@ signal.signal(signal.SIGINT, keyboardInterruptHandler)
 #need to wait for Python 2.7 for this..
 #logging.captureWarnings(True)
 
-POLL_INTERVAL = 1800
+POLL_INTERVAL = 480
 
 class PypoFetch(Thread):