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

CREDITS

@@ -1,3 +1,11 @@
+=======
+CREDITS
+=======
+Version 2.1.1
+-------------
+Same as previous version.
+
+
 =======
 CREDITS
 =======

VERSION

@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.1.0
+PRODUCT_RELEASE=2.1.1

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -17,7 +17,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         
         // automatic switch off
         $auto_transition = new Zend_Form_Element_Checkbox("auto_transition");
-        $auto_transition->setLabel("Auto Source Transition")
+        $auto_transition->setLabel("Auto Switch Off")
                         ->setValue(Application_Model_Preference::GetAutoTransition())
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($auto_transition);

airtime_mvc/application/models/Show.php

@@ -1303,7 +1303,7 @@ class Application_Model_Show {
         while ($utcStartDateTime->getTimestamp() <= $p_populateUntilDateTime->getTimestamp()
                 && (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){
 
-            list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone);
+            list($utcStartDateTime, $utcEndDateTime) = self::createUTCStartEndDateTime($start, $duration, $timezone);
 
             if ($show->hasInstanceOnDate($utcStartDateTime)){
                 $ccShowInstance = $show->getInstanceOnDate($utcStartDateTime);

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

@@ -292,7 +292,7 @@ $(document).ready(function() {
     
     $("#auto_transition_help").qtip({
         content: {
-            text: "Check this box to allow automatic transitions between sources. If enabled, Airtime will fallback to the next available source upon current (Master or Show) source failure. The fallback hierarchy is Master Source > Show Source > Scheduled Play."
+            text: "Check this box to automatically switch off Master/Show source upon source disconnection."
         },
         hide: {
             delay: 500,

changelog

@@ -1,3 +1,24 @@
+2.1.1 - June 12th, 2012
+  * Changes
+    * Add Media page will now display error message and reject uploaded file if it is corrupt
+    * jQuery schedule widget now show upcoming Sunday instead of previous Sunday
+    * fixed uploading files with upper case file extensions
+    * fixed master/source override URL being reverted to original setting after clicking 'Save' in stream settings.
+    * Add several helpful tips in the Stream Settings page and some UI cleanup
+    * DJ user type cannot delete Playlists that aren't their own or delete tracks
+    * Playlist Builder should remember your position instead of reseting to the first page everytime an operation was performed
+    * If Master or Live input source is disconnected, Airtime will no longer automatically switch off that source. This should allow the source to
+      reconnect and continue playback.
+  
+  * Bug fixes
+    * Fixed playout engine sometimes not receiving new schedule which could result in dead air
+    * Fixed script timeout which caused Apache to become unresponsive
+    * Fixed various Apache warnings
+    * Fixed not being able to delete some tracks that had been played
+    * Fixed calendar highlighting the wrong day due to server timezone being different from client browser timezone
+    * Promote my station opt-out button now works
+    * Fixed recording working sporadically on some system configurations
+
 2.1.0 - June 5th, 2012
   * The cool stuff:
     * Real-time show editing in the Now Playing and Calendar screens

install_minimal/include/airtime-constants.php

@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.1.0');
+define('AIRTIME_VERSION', '2.1.1');

install_minimal/include/airtime-upgrade.php

@@ -102,6 +102,11 @@ if (strcmp($version, "2.0.3") < 0){
 }
 if (strcmp($version, "2.1.0") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.0/airtime-upgrade.php");
+    pause();
+} 
+if (strcmp($version, "2.1.1") < 0){
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.1/airtime-upgrade.php");
+    pause();
 } 
 
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;

install_minimal/upgrades/airtime-2.1.1/DbUpgrade.php

@@ -0,0 +1,24 @@
+<?php
+
+/* All functions other than start() should be marked as
+ * private.
+ */
+class AirtimeDatabaseUpgrade{
+
+    public static function start($p_dbValues){
+        echo "* Updating Database".PHP_EOL;
+        self::task0($p_dbValues);
+        echo " * Complete".PHP_EOL;
+    }
+
+    private static function task0($p_dbValues){
+        
+        $username = $p_dbValues['database']['dbuser'];
+        $password = $p_dbValues['database']['dbpass'];
+        $host = $p_dbValues['database']['host'];
+        $database = $p_dbValues['database']['dbname'];
+        $dir = __DIR__;
+        
+        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
+    }
+}

install_minimal/upgrades/airtime-2.1.1/airtime-upgrade.php

@@ -0,0 +1,8 @@
+<?php
+
+require_once 'DbUpgrade.php';
+
+$filename = "/etc/airtime/airtime.conf";
+$values = parse_ini_file($filename, true);
+
+AirtimeDatabaseUpgrade::start($values);

install_minimal/upgrades/airtime-2.1.1/data/upgrade.sql

@@ -0,0 +1,2 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.1');

python_apps/api_clients/api_client.py

@@ -20,7 +20,7 @@ from configobj import ConfigObj
 import string
 import hashlib
 
-AIRTIME_VERSION = "2.1.0"
+AIRTIME_VERSION = "2.1.1"
 
 def api_client_factory(config, logger=None):
     if logger != None: