From a91c166332adc55c9b0ef441b5d60172a89a4beb Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 9 Oct 2012 12:08:49 -0400
Subject: [PATCH 01/38] Fixed failing unit tests

---
 python_apps/media-monitor2/tests/test_pure.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python_apps/media-monitor2/tests/test_pure.py b/python_apps/media-monitor2/tests/test_pure.py
index 5dfaaedc2..64d09dc62 100644
--- a/python_apps/media-monitor2/tests/test_pure.py
+++ b/python_apps/media-monitor2/tests/test_pure.py
@@ -39,7 +39,7 @@ class TestMMP(unittest.TestCase):
         orig = Metadata.airtime_dict({
                 'date'        : [u'2012-08-21'],
                 'tracknumber' : [u'2'],
-                'title'       : [u'11-29-00-record'],
+                'title'       : [u'record-2012-08-21-11:29:00'],
                 'artist'      : [u'Airtime Show Recorder']
         })
         orga = Metadata.airtime_dict({
@@ -57,7 +57,7 @@ class TestMMP(unittest.TestCase):
 
         self.assertEqual( orga, normalized )
 
-        organized_base_name = "2012-08-21-11-29-00-record-256kbps.ogg"
+        organized_base_name = "11:29:00-record-256kbps.ogg"
         base                = "/srv/airtime/stor/"
         organized_path      = mmp.organized_path(old_path,base, normalized)
         self.assertEqual(os.path.basename(organized_path), organized_base_name)

From 286e62ffddc277f447676bbf61e96794a0707907 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 9 Oct 2012 12:09:22 -0400
Subject: [PATCH 02/38] typo in comment

---
 python_apps/media-monitor2/media/monitor/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py
index 8ceaf2aa9..4ce46d099 100644
--- a/python_apps/media-monitor2/media/monitor/metadata.py
+++ b/python_apps/media-monitor2/media/monitor/metadata.py
@@ -182,7 +182,7 @@ class Metadata(Loggable):
                     that does not exist. Setting metadata to {}")
             self.__metadata = {}
             return
-        # TODO : Simplify the way all of these rules are handled right not it's
+        # TODO : Simplify the way all of these rules are handled right now it's
         # extremely unclear and needs to be refactored.
         #if full_mutagen is None: raise BadSongFile(fpath)
         if full_mutagen is None: full_mutagen = FakeMutagen(fpath)

From b4cf857ce5734e308a8b1600e137fa1bde0c0927 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 9 Oct 2012 12:09:44 -0400
Subject: [PATCH 03/38] remove cluttering comments

---
 python_apps/media-monitor2/media/monitor/metadata.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py
index 4ce46d099..bd42e434c 100644
--- a/python_apps/media-monitor2/media/monitor/metadata.py
+++ b/python_apps/media-monitor2/media/monitor/metadata.py
@@ -190,7 +190,6 @@ class Metadata(Loggable):
         # Now we extra the special values that are calculated from the mutagen
         # object itself:
 
-        # Hickity Hackity for .wav files. Properly do this later
         if mmp.extension(fpath) == 'wav':
             full_mutagen.set_length(mmp.read_wave_duration(fpath))
 

From 5ff89eeba27aaae45d7669691a90c9e33233d0c4 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 15 Oct 2012 14:19:52 -0400
Subject: [PATCH 04/38] CC-4561: Can create overlapping shows when
 rebroadcasting a repeating show

-fixed
---
 airtime_mvc/application/forms/AddShowWhen.php | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index a81c8d05d..eb4e68a35 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -208,9 +208,22 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                                 //this is a new show
                                 $overlapping = Application_Model_Schedule::checkOverlappingShows(
                                     $repeatShowStart, $repeatShowEnd);
+                                
+                                /* If the repeating show is rebroadcasted we need to check
+                                 * the rebroadcast dates relative to the repeating show
+                                 */
+                                if (!$overlapping && $formData['add_show_rebroadcast']) {
+                                    $overlapping = self::checkRebroadcastDates(
+                                        $repeatShowStart, $formData, $hours, $minutes);
+                                }
                             } else {
                                 $overlapping = Application_Model_Schedule::checkOverlappingShows(
                                     $repeatShowStart, $repeatShowEnd, $update, null, $formData["add_show_id"]);
+                                    
+                                if (!$overlapping && $formData['add_show_rebroadcast']) {
+                                    $overlapping = self::checkRebroadcastDates(
+                                        $repeatShowStart, $formData, $hours, $minutes, true);
+                                }
                             }
                             
                             if ($overlapping) {
@@ -275,6 +288,39 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         return $valid;
     }
 
+    public function checkRebroadcastDates($repeatShowStart, $formData, $hours, $minutes, $showEdit=false) {
+        $overlapping = false;
+        for ($i = 1; $i <= 10; $i++) {
+            if (empty($formData["add_show_rebroadcast_date_".$i])) break;
+            $rebroadcastShowStart = clone $repeatShowStart;
+            /* formData is in local time so we need to set the
+             * show start back to local time
+             */
+            $rebroadcastShowStart->setTimezone(new DateTimeZone(
+                Application_Model_Preference::GetTimezone()));
+            $rebroadcastWhenDays = explode(" ", $formData["add_show_rebroadcast_date_".$i]);
+            $rebroadcastWhenTime = explode(":", $formData["add_show_rebroadcast_time_".$i]);
+            $rebroadcastShowStart->add(new DateInterval("P".$rebroadcastWhenDays[0]."D"));
+            $rebroadcastShowStart->setTime($rebroadcastWhenTime[0], $rebroadcastWhenTime[1]);
+            $rebroadcastShowStart->setTimezone(new DateTimeZone('UTC'));
+            
+            $rebroadcastShowEnd = clone $rebroadcastShowStart;
+            $rebroadcastShowEnd->add(new DateInterval("PT".$hours."H".$minutes."M"));
+            
+            if ($showEdit) {
+                $overlapping = Application_Model_Schedule::checkOverlappingShows(
+                    $rebroadcastShowStart, $rebroadcastShowEnd, true, null, $formData['add_show_id']);
+            } else {
+                $overlapping = Application_Model_Schedule::checkOverlappingShows(
+                    $rebroadcastShowStart, $rebroadcastShowEnd);
+            }
+            
+            if ($overlapping) break;
+        }
+        
+        return $overlapping;
+    }
+    
     public function disable()
     {
         $elements = $this->getElements();

From 9d3271c03d28e902a57391a473e1552b317e4ae2 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 15 Oct 2012 15:36:38 -0400
Subject: [PATCH 05/38] CC-4562: Calendar: Add Show button is removed after
 editing a show from regular show to repeating show

-fixed
---
 airtime_mvc/application/controllers/ScheduleController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index adf84380e..a8b5b557c 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -784,7 +784,10 @@ class ScheduleController extends Zend_Controller_Action
 
         if ($success) {
             $scheduler = new Application_Model_Scheduler();
-            $scheduler->removeGaps($data['add_show_instance_id']);
+            $showInstances = CcShowInstancesQuery::create()->filterByDbShowId($data['add_show_id'])->find();
+            foreach ($showInstances as $si) {
+                $scheduler->removeGaps($si->getDbId());
+            }
             $this->view->addNewShow = true;
             $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
         } else {

From 03b32ea986f29de48730c89911bb5f92e47f646d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 10:37:42 -0400
Subject: [PATCH 06/38] CC-4563

Library: Exception is found when remove a block by context menu

- fixed
---
 airtime_mvc/public/js/airtime/library/library.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 161d18d45..a832134c1 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -815,9 +815,10 @@ var AIRTIME = (function(AIRTIME) {
                         //playlist screen if this is the currently edited playlist.
                         if ((data.ftype === "playlist" || data.ftype === "block") && screen === "playlist") {
                             callback = function() {
-                                
+                                aMedia = [];
+                                aMedia.push({"id": data.id, "type": data.ftype});
                                 if (confirm('Are you sure you want to delete the selected item?')) {
-                                    AIRTIME.playlist.fnDelete(data.id);
+                                    AIRTIME.library.fnDeleteItems(aMedia);
                                 }
                             };
                         }

From 8a93717415915f4a17187191c876e37b29407134 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 11:06:01 -0400
Subject: [PATCH 07/38] CC-4568: Show preview broken in Now Playing page

- fixed
---
 .../application/controllers/AudiopreviewController.php      | 1 +
 airtime_mvc/application/models/ShowInstance.php             | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index bd7505595..3718a86a0 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -278,6 +278,7 @@ class AudiopreviewController extends Zend_Controller_Action
                 'element_artist' => isset($track['creator']) ? $track['creator'] : "",
                 'element_position' => $position,
                 'element_id' => ++$position,
+                'mime' => isset($track['mime'])?$track['mime']:""
             );
 
             $elementMap['type'] = $track['type'];
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index b08a0e37c..6a513aac4 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -677,7 +677,8 @@ FROM (
                 f.length AS length,
                 f.artist_name AS creator,
                 f.file_exists AS EXISTS,
-                f.filepath AS filepath
+                f.filepath AS filepath,
+                f.mime AS mime
          FROM cc_schedule AS s
          LEFT JOIN cc_files AS f ON f.id = s.file_id
          WHERE s.instance_id = :instance_id1
@@ -693,7 +694,8 @@ FROM (
                 ws.length AS length,
                 sub.login AS creator,
                 't'::boolean AS EXISTS,
-                ws.url AS filepath
+                ws.url AS filepath,
+                ws.mime as mime
          FROM cc_schedule AS s
          LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id
          LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id

From a92956108860855588867dc2d34dbd366649fc8c Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Tue, 16 Oct 2012 11:59:37 -0400
Subject: [PATCH 08/38] CC-4565: Pypopush: Error happens when trying to insert
 a song right behind a Webstream as well as that Webstream is just finished

-make sure we don't return a negative when calculating interval
seconds
---
 python_apps/pypo/pypopush.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py
index aaacc1687..87e1704bf 100644
--- a/python_apps/pypo/pypopush.py
+++ b/python_apps/pypo/pypopush.py
@@ -399,7 +399,15 @@ class PypoPush(Thread):
 
 
     def date_interval_to_seconds(self, interval):
-        return (interval.microseconds + (interval.seconds + interval.days * 24 * 3600) * 10 ** 6) / float(10 ** 6)
+        """
+        Convert timedelta object into int representing the number of seconds. If
+        number of seconds is less than 0, then return 0.
+        """
+        seconds = (interval.microseconds + \
+                   (interval.seconds + interval.days * 24 * 3600) * 10 ** 6) / float(10 ** 6)
+        if seconds < 0: seconds = 0
+
+        return seconds
 
     def push_to_liquidsoap(self, event_chain):
 

From b061573d233a6716d83088a14e1cd25ca8fa881b Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 16 Oct 2012 12:04:52 -0400
Subject: [PATCH 09/38] CC-4554: Playout History search sticks on 'Processing'
 message

-fixed
---
 airtime_mvc/application/models/PlayoutHistory.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/PlayoutHistory.php b/airtime_mvc/application/models/PlayoutHistory.php
index ba845fa33..7da1ff2c2 100644
--- a/airtime_mvc/application/models/PlayoutHistory.php
+++ b/airtime_mvc/application/models/PlayoutHistory.php
@@ -16,12 +16,12 @@ class Application_Model_PlayoutHistory
     private $opts;
 
     private $mDataPropMap = array(
-        "artist"    => "file.artist_name",
-        "title"     => "file.track_title",
-        "played"    => "playout.played",
-        "length"    => "file.length",
-        "composer"  => "file.composer",
-        "copyright" => "file.copyright",
+        "artist"    => "artist_name",
+        "title"     => "track_title",
+        "played"    => "played",
+        "length"    => "length",
+        "composer"  => "composer",
+        "copyright" => "copyright",
     );
 
     public function __construct($p_startDT, $p_endDT, $p_opts)

From 7796b23a58702227ef55fb966801b2fc327dce85 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 12:06:47 -0400
Subject: [PATCH 10/38] CC-4506: Audio Preview in Playlist doesn't work

- fixed
---
 .../js/airtime/audiopreview/preview_jplayer.js    | 15 ++++++++++++---
 airtime_mvc/public/js/airtime/library/spl.js      |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
index 0f5a0b0fe..e7435ee2e 100644
--- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
+++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
@@ -123,6 +123,7 @@ function buildplaylist(p_url, p_playIndex) {
         var media;
         var index;
         var total = 0;
+        var skipped = 0;
         for(index in data) {
             if (data[index]['type'] == 0) { 
                 if (data[index]['element_mp3'] != undefined){
@@ -145,22 +146,30 @@ function buildplaylist(p_url, p_playIndex) {
                             artist: data[index]['element_artist'],
                             wav:data[index]['uri']
                     };
-                }  
+                } else {
+                    // skip this track since it's not supported
+                    console.log("continue");
+                    skipped++;
+                    continue;
+                } 
             } else if (data[index]['type'] == 1) {
                  media = {title: data[index]['element_title'],
                         artist: data[index]['element_artist'],
                         mp3:data[index]['uri']
                 };
             }
+            console.log(data[index]);
             if (media && isAudioSupported(data[index]['mime'])) {
-                myPlaylist[index] = media;
+                // javascript doesn't support associative array with numeric key
+                // so we need to remove the gap if we skip any of tracks due to
+                // browser incompatibility.
+                myPlaylist[index-skipped] = media;
             }
             // we should create a map according to the new position in the
             // player itself total is the index on the player
             _idToPostionLookUp[data[index]['element_id']] = total;
             total++;
         }
-        
         _playlist_jplayer.setPlaylist(myPlaylist);
         _playlist_jplayer.option("autoPlay", true);
         play(p_playIndex);
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index a5937820d..5e300dea6 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -366,7 +366,7 @@ var AIRTIME = (function(AIRTIME){
     //and verify whether they can be previewed by the browser or not. If not
     //then the playlist element is greyed out
     mod.validatePlaylistElements = function(){
-        $.each($(".big_play ui-icon-play"), function(index, value){
+        $.each($("div .big_play"), function(index, value){
             if ($(value).attr('blockId') === undefined) {
                 var mime = $(value).attr("data-mime-type");
                 if (isAudioSupported(mime)) {

From 67ca0db4c884feed32f224def8fe88947307f779 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 14:09:34 -0400
Subject: [PATCH 11/38] CC-4542: Playlists containing dynamic smart blocks
 cannot be previewed

- fixed
---
 .../views/scripts/playlist/update.phtml       |  2 +-
 airtime_mvc/public/js/airtime/library/spl.js  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index a51fd37db..70176ff9e 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -21,7 +21,7 @@ if ($item['type'] == 2) {
                 <span class="ui-icon ui-icon-play"></span>
             </div>
             <?php elseif ($item['type'] == 2 && $item['exists']): ?>
-            <div class="big_play" blockId="<?php echo $item["item_id"]; ?>">
+            <div class="big_play" blockId="<?php echo $item["item_id"]; ?>" blocktype="<?php echo $staticBlock?"static":"dynamic"?>">
                 <span class="ui-icon ui-icon-play"></span>
             </div>
             <?php else:?>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 5e300dea6..e79678201 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -393,6 +393,31 @@ var AIRTIME = (function(AIRTIME){
                         },
                     }) 
                 }
+            } else {
+                if ($(value).attr('blocktype') === 'dynamic') {
+                    $(value).attr("class", "big_play_disabled dark_class"); 
+                    $(value).qtip({
+                       content: 'Dynamic block is not previewable',
+                       show: 'mouseover',
+                        hide: {
+                            delay: 500,
+                            fixed: true
+                        },
+                        style: {
+                            border: {
+                                width: 0,
+                                radius: 4
+                            },
+                            classes: "ui-tooltip-dark ui-tooltip-rounded"
+                        },
+                        position: {
+                            my: "left bottom",
+                            at: "right center"
+                        },
+                    })
+                } else {
+                    $(value).bind("click", openAudioPreview);
+                }
             }
         });
     }

From 846af50543749e6977cf145eff5614a87e6368ad Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 16 Oct 2012 14:33:45 -0400
Subject: [PATCH 12/38] CC-4567: Calendar: Exception in zendphp.log when
 setting a wrong rebroadcast time from repeating show

-fixed
---
 airtime_mvc/application/forms/AddShowWhen.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index eb4e68a35..a3d445796 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -247,15 +247,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                 $overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
 
                 if (!$overlapping) {
+                    $durationToAdd = "PT".$hours."H".$minutes."M";
                     for ($i = 1; $i <= 10; $i++) {
-                        $hours = ltrim($hours, '0');
-                        if ($minutes != "00") {
-                            $minutes = ltrim($minutes, '0');
-                            $durationToAdd = "PT".$hours."H".$minutes."I";
-                        } else {
-                            $minutes = "0";
-                            $durationToAdd = "PT".$hours."H";
-                        }
                         
                         if (empty($formData["add_show_rebroadcast_date_absolute_".$i])) break;
                         

From 96da822bc7ca67ca9ef489588b595529bc61ea75 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 14:38:24 -0400
Subject: [PATCH 13/38] CC-4574: Audio preview fails with Zend errors on file
 with question mark in the title

- fixed
---
 airtime_mvc/public/js/airtime/common/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index aa449dddf..3125d8d55 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -54,7 +54,7 @@ function open_audio_preview(type, id, audioFileTitle, audioFileArtist) {
         audioFileTitle = audioFileTitle.substring(0,index);
     }
 
-    openPreviewWindow('audiopreview/audio-preview/audioFileID/'+id+'/audioFileArtist/'+audioFileArtist+'/audioFileTitle/'+audioFileTitle+'/type/'+type);
+    openPreviewWindow('audiopreview/audio-preview/audioFileID/'+id+'/audioFileArtist/'+encodeURIComponent(audioFileArtist)+'/audioFileTitle/'+encodeURIComponent(audioFileTitle)+'/type/'+type);
 
     _preview_window.focus();
 }

From 562c5099396ec2cd286e7b325dbbcde96736f2ee Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 14:51:14 -0400
Subject: [PATCH 14/38] CC-4570: blockId and blockIndex are visible at top of
 smart block preview pop-up

- fixed
---
 .../views/scripts/audiopreview/audio-preview.phtml          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index b4ec52bdf..f76249b9f 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -4,8 +4,8 @@
     <span class='playlistID'><?php echo "$this->playlistID" ?></span>
     <span class='playlistIndex'><?php echo "$this->playlistIndex" ?></span>
 <?php elseif (isset($this->blockId)): ?>
-    <span class='blockId'><?php echo "$this->blockId" ?></span>
-    <span class='blockIndex'><?php echo "$this->blockIndex" ?></span>
+    <span class='blockId' style="display: none;"><?php echo "$this->blockId" ?></span>
+    <span class='blockIndex' style="display: none;"><?php echo "$this->blockIndex" ?></span>
 <?php elseif (isset($this->uri)): ?>
     <span class='audioUri' style="display: none;"><?php echo "$this->uri" ?></span>
     <span class='audioMime' style="display: none;"><?php echo "$this->mime" ?></span>
@@ -51,7 +51,7 @@
                 </div>
                 <div class="jp-unmute">
                     <span class="ui-icon" tabindex="1" title="unmute">unmute</span>
-                </div> 
+                </div>
                 <div class="jp-volume-bar">
                     <div class="jp-volume-bar-value"></div>
                 </div>

From 25c28da7611c4cb7a8b7d897109cdb80581dc596 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 16 Oct 2012 15:29:05 -0400
Subject: [PATCH 15/38] CC-4550: Track should not be a required field in
 metadata editor

-fixed
---
 airtime_mvc/application/forms/EditAudioMD.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index ba7b1c4ef..2dc9e1f0f 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -32,9 +32,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('text', 'track_number', array(
             'label'      => 'Track:',
             'class'      => 'input_text',
-            'filters'    => array('StringTrim'),
-            'validators' => array('Int'),
-            'required' => true
+            'filters'    => array('StringTrim')
         ));
 
         // Add genre field

From 819dcf70fddabeab4a6231b9096a1a4cc8b51ea2 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 16 Oct 2012 15:56:03 -0400
Subject: [PATCH 16/38] CC-4579: Edit Metadata: Track number defaults to 0 if
 it is deleted

-fixed
---
 airtime_mvc/application/models/StoredFile.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index cd75da2d1..2300f4eb7 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -196,6 +196,10 @@ class Application_Model_StoredFile
                 if (isset($this->_dbMD[$dbColumn])) {
                     $propelColumn = $this->_dbMD[$dbColumn];
                     $method       = "set$propelColumn";
+                    
+                    /* We need to set track_number to null if it is an empty string
+                     * because propel defaults empty strings to zeros */
+                    if ($dbColumn == "track_number" && empty($mdValue)) $mdValue = null;
                     $this->_file->$method($mdValue);
                 }
             }

From 2b1db835dd6448b229f38dada3bf0a1d033733fb Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 16 Oct 2012 16:01:05 -0400
Subject: [PATCH 17/38] CC-4571: Now Playing delete action does not delete,
 should be labelled 'Remove from show'

-done
---
 .../application/controllers/ShowbuilderController.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 23c3fd55b..a31119cdb 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -186,13 +186,13 @@ class ShowbuilderController extends Zend_Controller_Action
 
         $menu["preview"] = array("name"=> "Preview", "icon" => "play");
         //select the cursor
-        $menu["selCurs"] = array("name"=> "Select Cursor","icon" => "select-cursor");
-        $menu["delCurs"] = array("name"=> "Remove Cursor","icon" => "select-cursor");
+        $menu["selCurs"] = array("name"=> "Select cursor","icon" => "select-cursor");
+        $menu["delCurs"] = array("name"=> "Remove cursor","icon" => "select-cursor");
 
         if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) {
 
             //remove/truncate the item from the schedule
-            $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/showbuilder/schedule-remove");
+            $menu["del"] = array("name"=> "Remove from show", "icon" => "delete", "url" => "/showbuilder/schedule-remove");
         }
 
         $this->view->items = $menu;

From 3f1df4922105e2985eb10683ef004146a5cb7e6e Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 16:22:44 -0400
Subject: [PATCH 18/38] CC-4572: Adding a playlist to a show in Now Playing
 page fails, interface greys out

- bug with php 5.3.2 with DateTime::createFromFormat()
- fixed with workaround
---
 .../models/airtime/CcBlockcontents.php        | 20 ++++++++++++++-----
 .../models/airtime/CcPlaylistcontents.php     | 18 +++++++++++++----
 .../application/models/airtime/CcSchedule.php | 18 +++++++++++++----
 .../propel/airtime/CcPlaylistcontents.php     | 18 +++++++++++++----
 .../propel/airtime/CcSchedule.php             | 18 +++++++++++++----
 5 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/CcBlockcontents.php b/airtime_mvc/application/models/airtime/CcBlockcontents.php
index 5fcfbbf24..7c307610a 100644
--- a/airtime_mvc/application/models/airtime/CcBlockcontents.php
+++ b/airtime_mvc/application/models/airtime/CcBlockcontents.php
@@ -5,7 +5,7 @@
 /**
  * Skeleton subclass for representing a row from the 'cc_blockcontents' table.
  *
- * 
+ *
  *
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
@@ -44,11 +44,16 @@ class CcBlockcontents extends BaseCcBlockcontents {
      */
     public function setDbFadein($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -58,7 +63,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
             }
         }
     
-        $this->fadein = $dt->format('H:i:s.u');
+        $this->fadein = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcBlockcontentsPeer::FADEIN;
     
         return $this;
@@ -72,11 +77,16 @@ class CcBlockcontents extends BaseCcBlockcontents {
      */
     public function setDbFadeout($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -86,7 +96,7 @@ class CcBlockcontents extends BaseCcBlockcontents {
             }
         }
     
-        $this->fadeout = $dt->format('H:i:s.u');
+        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcBlockcontentsPeer::FADEOUT;
     
         return $this;
diff --git a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
index b5125de32..1b0abe796 100644
--- a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
+++ b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
@@ -43,11 +43,16 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
      */
     public function setDbFadein($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -57,7 +62,7 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadein = $dt->format('H:i:s.u');
+        $this->fadein = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
 
         return $this;
@@ -71,11 +76,16 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
     */
     public function setDbFadeout($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -85,7 +95,7 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadeout = $dt->format('H:i:s.u');
+        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
 
         return $this;
diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php
index 75a01e758..7e29c7641 100644
--- a/airtime_mvc/application/models/airtime/CcSchedule.php
+++ b/airtime_mvc/application/models/airtime/CcSchedule.php
@@ -107,11 +107,16 @@ class CcSchedule extends BaseCcSchedule {
      */
     public function setDbFadeIn($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -120,7 +125,7 @@ class CcSchedule extends BaseCcSchedule {
                 throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
             }
         }
-        $this->fade_in = $dt->format('H:i:s.u');
+        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcSchedulePeer::FADE_IN;
 
         return $this;
@@ -134,11 +139,16 @@ class CcSchedule extends BaseCcSchedule {
     */
     public function setDbFadeOut($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -148,7 +158,7 @@ class CcSchedule extends BaseCcSchedule {
             }
         }
 
-        $this->fade_out = $dt->format('H:i:s.u');
+        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
 
         return $this;
diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
index b5125de32..1b0abe796 100644
--- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
+++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
@@ -43,11 +43,16 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
      */
     public function setDbFadein($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -57,7 +62,7 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadein = $dt->format('H:i:s.u');
+        $this->fadein = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
 
         return $this;
@@ -71,11 +76,16 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
     */
     public function setDbFadeout($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -85,7 +95,7 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadeout = $dt->format('H:i:s.u');
+        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
 
         return $this;
diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
index 75a01e758..6108e48af 100644
--- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
+++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
@@ -107,11 +107,16 @@ class CcSchedule extends BaseCcSchedule {
      */
     public function setDbFadeIn($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -120,7 +125,7 @@ class CcSchedule extends BaseCcSchedule {
                 throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
             }
         }
-        $this->fade_in = $dt->format('H:i:s.u');
+        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcSchedulePeer::FADE_IN;
 
         return $this;
@@ -134,11 +139,16 @@ class CcSchedule extends BaseCcSchedule {
     */
     public function setDbFadeOut($v)
     {
+        $microsecond = 0;
         if ($v instanceof DateTime) {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            $dt = DateTime::createFromFormat("s.u", $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
+            $microsecond = $info[1];
+            $dt = DateTime::createFromFormat("s", $info[0]);
         }
         else {
             try {
@@ -148,7 +158,7 @@ class CcSchedule extends BaseCcSchedule {
             }
         }
 
-        $this->fade_out = $dt->format('H:i:s.u');
+        $this->fade_out = $dt->format('H:i:s').".".$microsecond;
         $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
 
         return $this;

From c1745145e8512fd9bf9de2358e767af2231c6809 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 16 Oct 2012 16:25:56 -0400
Subject: [PATCH 19/38] - CRLF fix

---
 airtime_mvc/application/models/airtime/CcSchedule.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php
index 7e29c7641..4230c54b8 100644
--- a/airtime_mvc/application/models/airtime/CcSchedule.php
+++ b/airtime_mvc/application/models/airtime/CcSchedule.php
@@ -144,9 +144,9 @@ class CcSchedule extends BaseCcSchedule {
             $dt = $v;
         }
         else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) {
-            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
-            // Hence we need to do parsing.
-            $info = explode('.', $v);
+            // in php 5.3.2 createFromFormat() with "u" is not supported(bug)
+            // Hence we need to do parsing.
+            $info = explode('.', $v);
             $microsecond = $info[1];
             $dt = DateTime::createFromFormat("s", $info[0]);
         }

From 893f9509fa477eb397bb41a0543009525309e289 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 16 Oct 2012 18:35:56 -0400
Subject: [PATCH 20/38] cc-4556: fixed

---
 python_apps/media-monitor2/media/monitor/events.py        | 2 +-
 python_apps/media-monitor2/media/monitor/watchersyncer.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor2/media/monitor/events.py
index 932c78d69..a8ccc3b54 100644
--- a/python_apps/media-monitor2/media/monitor/events.py
+++ b/python_apps/media-monitor2/media/monitor/events.py
@@ -43,7 +43,7 @@ class EventRegistry(object):
                          methods")
 
 
-class EventProxy(object):
+class EventProxy(Loggable):
     """
     A container object for instances of BaseEvent (or it's subclasses) used for
     event contractor
diff --git a/python_apps/media-monitor2/media/monitor/watchersyncer.py b/python_apps/media-monitor2/media/monitor/watchersyncer.py
index 61146326a..e7a2cf9c0 100644
--- a/python_apps/media-monitor2/media/monitor/watchersyncer.py
+++ b/python_apps/media-monitor2/media/monitor/watchersyncer.py
@@ -126,7 +126,8 @@ class WatchSyncer(ReportHandler,Loggable):
             try:
                 # If there is a strange bug anywhere in the code the next line
                 # should be a suspect
-                if self.contractor.register(EventProxy(event)): self.push_queue( event )
+                ev = EventProxy(event)
+                if self.contractor.register(ev): self.push_queue(ev)
                 #self.push_queue( event )
             except BadSongFile as e:
                 self.fatal_exception("Received bas song file '%s'" % e.path, e)

From 45801e5dc487d0620b68198f5376f6a76f8d8beb Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 17 Oct 2012 15:16:03 -0400
Subject: [PATCH 21/38] - fix spelling of some function name

---
 airtime_mvc/application/controllers/ApiController.php  |  6 +++---
 .../application/controllers/PreferenceController.php   |  4 ++--
 .../application/forms/LiveStreamingPreferences.php     |  4 ++--
 airtime_mvc/application/models/Preference.php          | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 1e3cee844..6572774cc 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -313,7 +313,7 @@ class ApiController extends Zend_Controller_Action
             }
             
             //used by caller to determine if the airtime they are running or widgets in use is out of date.
-            $result['AIRTIME_API_VERSION'] = AIRTIME_API_VERSION;             
+            $result['AIRTIME_API_VERSION'] = AIRTIME_API_VERSION;
             header("Content-type: text/javascript");
             // If a callback is not given, then just provide the raw JSON.
             echo isset($_GET['callback']) ? $_GET['callback'].'('.json_encode($result).')' : json_encode($result);
@@ -830,8 +830,8 @@ class ApiController extends Zend_Controller_Action
 
         if ($djtype == 'master') {
             //check against master
-            if ($username == Application_Model_Preference::GetLiveSteamMasterUsername()
-                    && $password == Application_Model_Preference::GetLiveSteamMasterPassword()) {
+            if ($username == Application_Model_Preference::GetLiveStreamMasterUsername()
+                    && $password == Application_Model_Preference::GetLiveStreamMasterPassword()) {
                 $this->view->msg = true;
             } else {
                 $this->view->msg = false;
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 49ce2a4a1..5c375deab 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -220,8 +220,8 @@ class PreferenceController extends Zend_Controller_Action
 
                 // this goes into cc_pref table
                 Application_Model_Preference::SetStreamLabelFormat($values['streamFormat']);
-                Application_Model_Preference::SetLiveSteamMasterUsername($values["master_username"]);
-                Application_Model_Preference::SetLiveSteamMasterPassword($values["master_password"]);
+                Application_Model_Preference::SetLiveStreamMasterUsername($values["master_username"]);
+                Application_Model_Preference::SetLiveStreamMasterPassword($values["master_password"]);
                 Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]);
                 Application_Model_Preference::SetAutoTransition($values["auto_transition"]);
                 Application_Model_Preference::SetAutoSwitch($values["auto_switch"]);
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index 8f7ac95c0..e66976c8b 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -45,7 +45,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                         ->setAllowEmpty(true)
                         ->setLabel('Master Username')
                         ->setFilters(array('StringTrim'))
-                        ->setValue(Application_Model_Preference::GetLiveSteamMasterUsername())
+                        ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername())
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($master_username);
 
@@ -59,7 +59,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $master_password->setAttrib('autocomplete', 'off')
                         ->setAttrib('renderPassword','true')
                         ->setAllowEmpty(true)
-                        ->setValue(Application_Model_Preference::GetLiveSteamMasterPassword())
+                        ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword())
                         ->setLabel('Master Password')
                         ->setFilters(array('StringTrim'))
                         ->setDecorators(array('ViewHelper'));
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 8f08e385e..e65151ce4 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -892,22 +892,22 @@ class Application_Model_Preference
         return (strlen($val) == 0) ? 0 : $val;
     }
 
-    public static function SetLiveSteamMasterUsername($value)
+    public static function SetLiveStreamMasterUsername($value)
     {
         self::setValue("live_stream_master_username", $value, false);
     }
 
-    public static function GetLiveSteamMasterUsername()
+    public static function GetLiveStreamMasterUsername()
     {
         return self::getValue("live_stream_master_username");
     }
 
-    public static function SetLiveSteamMasterPassword($value)
+    public static function SetLiveStreamMasterPassword($value)
     {
         self::setValue("live_stream_master_password", $value, false);
     }
 
-    public static function GetLiveSteamMasterPassword()
+    public static function GetLiveStreamMasterPassword()
     {
         return self::getValue("live_stream_master_password");
     }
@@ -1093,7 +1093,7 @@ class Application_Model_Preference
 
 
 
-    public static function getOrderingMap($pref_param) 
+    public static function getOrderingMap($pref_param)
     {
         $v = self::getValue($pref_param, true);
 

From 5fc72d9e513aeae8cd01337132d873d2e6f903b1 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Wed, 17 Oct 2012 15:28:05 -0400
Subject: [PATCH 22/38] add function necessary for saas

---
 .../application/models/StreamSetting.php      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index a5740c70f..cdd7747b7 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -219,6 +219,25 @@ class Application_Model_StreamSetting
         }
     }
 
+    /*
+     * Sets indivisual stream setting.
+     *
+     * $data - data array. $data is [].
+     * TODO: Make this SQL a prepared statement!
+     *
+     * Do not remove this function. It is called by airtime-system.php
+     */
+    public static function setIndividualStreamSetting($data)
+    {
+        $con = Propel::getConnection();
+
+        foreach ($data as $keyname => $v) {
+            $sql = "UPDATE cc_stream_setting SET value='$v' WHERE keyname='$keyname'";
+            $con->exec($sql);
+        }
+    }
+
+
     /*
      * Stores liquidsoap status if $boot_time > save time.
      * save time is the time that user clicked save on stream setting page

From e01f86c37757a5934e706b6352c408e30a37bc02 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Wed, 17 Oct 2012 16:45:03 -0400
Subject: [PATCH 23/38] CC-4588: Airtime 2.2 upgrade does not upgrade
 "list_all_db_files" correctly

-fixed
---
 .../upgrades/airtime-2.2.0/common/UpgradeCommon.php  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
index 1d7183bcc..77c297a65 100644
--- a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
@@ -105,6 +105,12 @@ class UpgradeCommon{
 
         self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
         self::MergeConfigFiles($configFiles, $suffix);
+
+        //HACK: This will fix a last minute bug we discovered with our upgrade scripts.
+        //Will be fixed properly in 2.3.0
+        $old = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'";
+        $new = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%/all/%%all%%'";
+        exec("sed -i \"s#$old#$new#g\" /etc/airtime/api_client.cfg");
     }
 
     /**
@@ -162,11 +168,13 @@ class UpgradeCommon{
                             foreach($sectionKeys as $sectionKey) {
 
                                 if(isset($oldSettings[$section][$sectionKey])) {
-                                    self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
+                                    self::UpdateIniValue($conf, $sectionKey,
+                                        $oldSettings[$section][$sectionKey]);
                                 }
                             }
                         } else {
-                            self::UpdateIniValue($conf, $section, $oldSettings[$section]);
+                            self::UpdateIniValue($conf, $section, 
+                                $oldSettings[$section]);
                         }
                     }
                 }

From 7c799cd3af3ae955ebe93ed3026ccc2d173eb1ed Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@64studio.com>
Date: Thu, 18 Oct 2012 13:01:55 +0100
Subject: [PATCH 24/38] Fixed formatting of tooltip for smart blocks

---
 airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index 9862eb48e..0dc3bc0a9 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -363,7 +363,7 @@ function setupUI() {
     
     $(".playlist_type_help_icon").qtip({
         content: {
-            text: "A static smart block will save the criteria and generate the block content immediately." +
+            text: "A static smart block will save the criteria and generate the block content immediately. " +
                   "This allows you to edit and view it in the Library before adding it to a show.<br /><br />" +
                   "A dynamic smart block will only save the criteria. The block content will get generated upon " +
                   "adding it to a show. You will not be able to view and edit the content in the Library."

From 887a86c6a16aea01e4a14ae6e88a33a3ac44372f Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 18 Oct 2012 10:51:24 -0400
Subject: [PATCH 25/38] CC-4591: Calendar: Cannot change start time for
 repeating show

-fixed
---
 airtime_mvc/application/forms/AddShowWhen.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index a3d445796..1ed9d2619 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -179,7 +179,14 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                 /* Check first show
                  * Continue if the first show does not overlap
                  */
-                $overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
+                if ($update) {
+                    $overlapping = Application_Model_Schedule::checkOverlappingShows(
+                                    $show_start, $show_end, $update, null, $formData["add_show_id"]);
+                } else {
+                    $overlapping = Application_Model_Schedule::checkOverlappingShows(
+                                    $show_start, $show_end);
+                }
+                //$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
 
                 /* Check if repeats overlap with previously scheduled shows
                  * Do this for each show day

From dc7b60911555ef4f9ffbb860c79d77bf4d5db9f6 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@64studio.com>
Date: Thu, 18 Oct 2012 16:12:51 +0100
Subject: [PATCH 26/38] CC-4593: Widen container in CSS so label is not
 truncated

---
 airtime_mvc/public/css/playlist_builder.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css
index ea8a35586..43b942a7f 100644
--- a/airtime_mvc/public/css/playlist_builder.css
+++ b/airtime_mvc/public/css/playlist_builder.css
@@ -85,7 +85,7 @@
     font-size: 9px;
     height: 15px;
     /*right: 35px;*/
-    width: 120px;
+    width: 124px;
     margin-top: 2px;
     cursor: pointer;
     color: #fff;
@@ -584,4 +584,4 @@ li.spl_empty {
 }
 .expand-block-separate {
     border-top: 1px solid #5B5B5B;
-}
\ No newline at end of file
+}

From 6c8c7aa2855f9f55a68aee71e8f03af8c0143621 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 18 Oct 2012 12:09:48 -0400
Subject: [PATCH 27/38] CC-4592: Library: Changing fades does not save
 microseconds

-fixed
---
 .../application/models/airtime/CcBlockcontents.php | 14 +++++++++++---
 .../models/airtime/CcPlaylistcontents.php          | 12 ++++++++++--
 .../application/models/airtime/CcSchedule.php      | 13 +++++++++++--
 .../propel/airtime/CcPlaylistcontents.php          | 12 ++++++++++--
 .../airtime-2.1.0/propel/airtime/CcSchedule.php    | 12 ++++++++++--
 5 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/CcBlockcontents.php b/airtime_mvc/application/models/airtime/CcBlockcontents.php
index 7c307610a..caae46f6a 100644
--- a/airtime_mvc/application/models/airtime/CcBlockcontents.php
+++ b/airtime_mvc/application/models/airtime/CcBlockcontents.php
@@ -63,7 +63,11 @@ class CcBlockcontents extends BaseCcBlockcontents {
             }
         }
     
-        $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadein = $dt->format('H:i:s.u');
+        } else {
+            $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcBlockcontentsPeer::FADEIN;
     
         return $this;
@@ -95,8 +99,12 @@ class CcBlockcontents extends BaseCcBlockcontents {
                 throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
             }
         }
-    
-        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+
+        if ($microsecond == 0) {
+            $this->fadeout = $dt->format('H:i:s.u');
+        } else {
+            $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcBlockcontentsPeer::FADEOUT;
     
         return $this;
diff --git a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
index 1b0abe796..ab0aa6d56 100644
--- a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
+++ b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php
@@ -62,7 +62,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadein = $dt->format('H:i:s.u');
+        } else {
+            $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
 
         return $this;
@@ -95,7 +99,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadeout = $dt->format('H:i:s.u');
+        } else {
+            $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
 
         return $this;
diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php
index 4230c54b8..e051df6c3 100644
--- a/airtime_mvc/application/models/airtime/CcSchedule.php
+++ b/airtime_mvc/application/models/airtime/CcSchedule.php
@@ -125,7 +125,12 @@ class CcSchedule extends BaseCcSchedule {
                 throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
             }
         }
-        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
+
+        if ($microsecond == 0) {
+            $this->fadein = $dt->format('H:i:s.u');
+        } else {
+            $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcSchedulePeer::FADE_IN;
 
         return $this;
@@ -158,7 +163,11 @@ class CcSchedule extends BaseCcSchedule {
             }
         }
 
-        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadeout = $dt->format('H:i:s.u');
+        } else {
+            $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
 
         return $this;
diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
index 1b0abe796..ab0aa6d56 100644
--- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
+++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php
@@ -62,7 +62,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadein = $dt->format('H:i:s.u');
+        } else {
+            $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
 
         return $this;
@@ -95,7 +99,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
             }
         }
 
-        $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadeout = $dt->format('H:i:s.u');
+        } else {
+            $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
 
         return $this;
diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
index 6108e48af..b411d410e 100644
--- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
+++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php
@@ -125,7 +125,11 @@ class CcSchedule extends BaseCcSchedule {
                 throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x);
             }
         }
-        $this->fade_in = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadein = $dt->format('H:i:s.u');
+        } else {
+            $this->fadein = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcSchedulePeer::FADE_IN;
 
         return $this;
@@ -158,7 +162,11 @@ class CcSchedule extends BaseCcSchedule {
             }
         }
 
-        $this->fade_out = $dt->format('H:i:s').".".$microsecond;
+        if ($microsecond == 0) {
+            $this->fadeout = $dt->format('H:i:s.u');
+        } else {
+            $this->fadeout = $dt->format('H:i:s').".".$microsecond;
+        }
         $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
 
         return $this;

From 9444fc34186d507df4b4ce4582922b66bd459e9d Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Thu, 18 Oct 2012 14:28:52 -0400
Subject: [PATCH 28/38] invalid sql statement that was deleting cc_schedule on
 upgrade

---
 install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
index 8f8c5486c..36b4f5734 100644
--- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
@@ -22,7 +22,7 @@ WHERE id IN
     (SELECT s.id
      FROM cc_schedule s
      LEFT JOIN cc_show_instances si ON s.instance_id = si.id
-     AND si.modified_instance = 't');
+     WHERE si.modified_instance = 't');
 
 ALTER TABLE cc_files
 	DROP CONSTRAINT cc_files_gunid_idx;

From 67ac4340c4e7963253ba1dc7199b35ddc53d32bd Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 18 Oct 2012 14:47:19 -0400
Subject: [PATCH 29/38] CC-4596: Too many ajax calls in Calendar page

-fixed
---
 .../public/js/airtime/schedule/full-calendar-functions.js        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index f583f4df7..a9cd82be3 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -206,7 +206,6 @@ function viewDisplay( view ) {
 }
 
 function eventRender(event, element, view) {
-    getCurrentShow();
     
     $(element).data("event", event);
 

From 6727bce3281ec0e3e11d5f0f47466105f413144f Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 18 Oct 2012 15:03:59 -0400
Subject: [PATCH 30/38] CC-4598: Smart block: cannot save dynamic block with
 0.5 hours

-fixed
---
 airtime_mvc/application/models/Block.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 4d62b8329..eb1aab691 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -319,12 +319,12 @@ SQL;
                 if ($mins >59) {
                     $hour  = intval($mins/60);
                     $hour  = str_pad($hour, 2, "0", STR_PAD_LEFT);
-                    $value = $mins%60;
+                    $mins = $mins%60;
                 }
             }
             $hour   = str_pad($hour, 2, "0", STR_PAD_LEFT);
-            $value  = str_pad($value, 2, "0", STR_PAD_LEFT);
-            $length = $hour.":".$value.":00";
+            $mins  = str_pad($mins, 2, "0", STR_PAD_LEFT);
+            $length = $hour.":".$mins.":00";
         }
 
         return $length;

From e9815b617b66aa657e929d3b8f5f89382cc60b54 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 18 Oct 2012 15:21:38 -0400
Subject: [PATCH 31/38] - added comment

---
 .../public/js/airtime/schedule/full-calendar-functions.js     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index a9cd82be3..ac57d6afb 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -370,7 +370,9 @@ function checkSCUploadStatus(){
         });
     });
 }
-
+/** This function adds and removes the current
+ *  show icon
+ */
 function getCurrentShow(){
     var url = '/Schedule/get-current-show/format/json',
         id,

From d838d8ae30b77704e51b167e28de32aade57bc21 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Thu, 18 Oct 2012 17:34:37 -0400
Subject: [PATCH 32/38] update version number in VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 682777c6f..c7aac0e6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.1.3
+PRODUCT_RELEASE=2.2.0

From 58d00cb9b90aacbbde00d0b89e9f58df0dcde3ca Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Fri, 19 Oct 2012 11:05:12 -0400
Subject: [PATCH 33/38] Formatting sql

---
 .../application/models/ShowInstance.php       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 6a513aac4..3dfd8756f 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -670,15 +670,15 @@ SELECT *
 FROM (
         (SELECT s.starts,
                 0::INTEGER as type ,
-                f.id AS item_id,
+                f.id           AS item_id,
                 f.track_title,
-                f.album_title AS album,
-                f.genre AS genre,
-                f.length AS length,
-                f.artist_name AS creator,
-                f.file_exists AS EXISTS,
-                f.filepath AS filepath,
-                f.mime AS mime
+                f.album_title  AS album,
+                f.genre        AS genre,
+                f.length       AS length,
+                f.artist_name  AS creator,
+                f.file_exists  AS EXISTS,
+                f.filepath     AS filepath,
+                f.mime         AS mime
          FROM cc_schedule AS s
          LEFT JOIN cc_files AS f ON f.id = s.file_id
          WHERE s.instance_id = :instance_id1
@@ -689,12 +689,12 @@ FROM (
                 1::INTEGER as type,
                 ws.id AS item_id,
                 (ws.name || ': ' || ws.url) AS title,
-                null AS album,
-                null AS genre,
-                ws.length AS length,
-                sub.login AS creator,
-                't'::boolean AS EXISTS,
-                ws.url AS filepath,
+                null            AS album,
+                null            AS genre,
+                ws.length       AS length,
+                sub.login       AS creator,
+                't'::boolean    AS EXISTS,
+                ws.url          AS filepath,
                 ws.mime as mime
          FROM cc_schedule AS s
          LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id

From ffca5b42a89e7ffbf4725cdf0494c2847feffe2b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Fri, 19 Oct 2012 11:07:37 -0400
Subject: [PATCH 34/38] CC-4605: Some AJAX calls are cached

---
 airtime_mvc/public/js/airtime/dashboard/dashboard.js  |  2 +-
 airtime_mvc/public/js/airtime/library/library.js      |  3 +++
 airtime_mvc/public/js/airtime/nowplaying/register.js  |  2 ++
 .../public/js/airtime/playouthistory/historytable.js  |  3 ++-
 airtime_mvc/public/js/airtime/schedule/schedule.js    |  5 ++++-
 airtime_mvc/public/js/airtime/showbuilder/builder.js  |  4 ++++
 .../public/js/airtime/showbuilder/main_builder.js     |  3 +++
 airtime_mvc/public/js/airtime/user/user.js            | 11 +++++++++--
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 98a167238..741c5b4fa 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -360,7 +360,7 @@ function controlSwitchLight(){
 }
 
 function getScheduleFromServer(){
-    $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
+    $.ajax({ cache: false, url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
                 parseItems(data.entries);
                 parseSourceStatus(data.source_status);
                 parseSwitchStatus(data.switch_status);
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index a832134c1..cfab12c6b 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -479,6 +479,7 @@ var AIRTIME = (function(AIRTIME) {
             "fnStateSave": function (oSettings, oData) {
                 localStorage.setItem('datatables-library', JSON.stringify(oData));
                 $.ajax({
+                    cache: false,
                     url: "/usersettings/set-library-datatable",
                     type: "POST",
                     data: {settings : oData, format: "json"},
@@ -542,6 +543,7 @@ var AIRTIME = (function(AIRTIME) {
                 aoData.push( { name: "type", value: type} );
             
                 $.ajax( {
+                    "cache": false,
                     "dataType": 'json',
                     "type": "POST",
                     "url": sSource,
@@ -883,6 +885,7 @@ var AIRTIME = (function(AIRTIME) {
                 }
                 
                 request = $.ajax({
+                  cache: false,
                   url: "/library/context-menu",
                   type: "GET",
                   data: {id : data.id, type: data.ftype, format: "json", "screen": screen},
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index 0b5b04249..068f0d11a 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -21,6 +21,7 @@ $(document).ready(function(){
                 click: function() {
                     var url = '/Usersettings/remindme';
                     $.ajax({
+                        cache: false,
                         url: url,
                         data: {format:"json"}
                     });
@@ -34,6 +35,7 @@ $(document).ready(function(){
                 click: function() {
                     var url ='/Usersettings/remindme-never';
                     $.ajax({
+                        cache: false,
                         url: url,
                         data: {format:"json"}
                     });
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index 9a0db2680..0371fada5 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -54,6 +54,7 @@ var AIRTIME = (function(AIRTIME) {
             aoData.push( { name: "format", value: "json"} );
             
             $.ajax( {
+                "cache": false,
                 "dataType": 'json',
                 "type": "GET",
                 "url": sSource,
@@ -183,4 +184,4 @@ $(document).ready(function(){
 		oTable.fnDraw();
 	});
 	
-});
\ No newline at end of file
+});
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index 5a43f1eb2..3bddc60f5 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -36,6 +36,7 @@ function confirmCancelShow(show_instance_id){
     if (confirm('Cancel Current Show?')) {
         var url = "/Schedule/cancel-current-show";
         $.ajax({
+            cache: false,
             url: url,
             data: {format: "json", id: show_instance_id},
             success: function(data){
@@ -50,6 +51,7 @@ function confirmCancelRecordedShow(show_instance_id){
         var url = "/Schedule/cancel-current-show";
         $.ajax({
             url: url,
+            cache: false,
             data: {format: "json", id: show_instance_id},
             success: function(data){
                 scheduleRefetchEvents(data);
@@ -289,7 +291,7 @@ function alertShowErrorAndReload(){
 }
 
 $(document).ready(function() {
-    $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
+    $.ajax({ cache: false, url: "/Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
             , error:function(jqXHR, textStatus, errorThrown){}});
     
     setInterval(checkCalendarSCUploadStatus, 5000);
@@ -459,6 +461,7 @@ $(document).ready(function() {
             }
             
             $.ajax({
+              cache: false,
               url: "/schedule/make-context-menu",
               type: "GET",
               data: {id : data.id, format: "json"},
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 9839df06c..8bcfbdc4a 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -326,6 +326,7 @@ var AIRTIME = (function(AIRTIME){
         }
         
         $.ajax({
+            "cache": false,
             "dataType": "json",
             "type": "POST",
             "url": sSource,
@@ -379,6 +380,7 @@ var AIRTIME = (function(AIRTIME){
                 localStorage.setItem('datatables-timeline', JSON.stringify(oData));
                 
                 $.ajax({
+                  cache: false,
                   url: "/usersettings/set-timeline-datatable",
                   type: "POST",
                   data: {settings : oData, format: "json"},
@@ -1003,6 +1005,7 @@ var AIRTIME = (function(AIRTIME){
                     if (confirm(msg)) {
                         var url = "/Schedule/cancel-current-show";
                         $.ajax({
+                            cache: false,
                             url: url,
                             data: {format: "json", id: data.instance},
                             success: function(data){
@@ -1181,6 +1184,7 @@ var AIRTIME = (function(AIRTIME){
                 }
                 
                 request = $.ajax({
+                  cache: false,
                   url: "/showbuilder/context-menu",
                   type: "GET",
                   data: {id : data.id, format: "json"},
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index b640a2882..60a224838 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -168,6 +168,7 @@ AIRTIME = (function(AIRTIME) {
 			schedTable.fnDraw();
 			
 			$.ajax({
+                cache: false,
 	            url: "/usersettings/set-now-playing-screen-settings",
 	            type: "POST",
 	            data: {settings : {library : true}, format: "json"},
@@ -192,6 +193,7 @@ AIRTIME = (function(AIRTIME) {
 			schedTable.fnDraw();
 			
 			$.ajax({
+                cache: false,
 	            url: "/usersettings/set-now-playing-screen-settings",
 	            type: "POST",
 	            data: {settings : {library : false}, format: "json"},
@@ -257,6 +259,7 @@ AIRTIME = (function(AIRTIME) {
 			}
 			
 			$.ajax( {
+                "cache": false,
 				"dataType": "json",
 				"type": "GET",
 				"url": "/showbuilder/check-builder-feed",
diff --git a/airtime_mvc/public/js/airtime/user/user.js b/airtime_mvc/public/js/airtime/user/user.js
index 5c8278914..a6ae9b3f8 100644
--- a/airtime_mvc/public/js/airtime/user/user.js
+++ b/airtime_mvc/public/js/airtime/user/user.js
@@ -24,13 +24,19 @@ function populateForm(entries){
 }
 
 function rowClickCallback(row_id){
-      $.ajax({ url: '/User/get-user-data/id/'+ row_id +'/format/json', dataType:"json", success:function(data){
+      $.ajax({ cache: false,
+             url: '/User/get-user-data/id/'+ row_id +'/format/json', 
+             dataType:"json", 
+             success:function(data){
         populateForm(data.entries);
 	  }});    
 }
 
 function removeUserCallback(row_id, nRow){
-      $.ajax({ url: '/User/remove-user/id/'+ row_id +'/format/json', dataType:"text", success:function(data){
+      $.ajax({ cache: false,
+             url: '/User/remove-user/id/'+ row_id +'/format/json', 
+             dataType:"text", 
+             success:function(data){
         var o = $('#users_datatable').dataTable().fnDeleteRow(nRow);
 	  }});
 }
@@ -67,6 +73,7 @@ $(document).ready(function() {
         "sAjaxSource": "/User/get-user-data-table-info/format/json",
         "fnServerData": function ( sSource, aoData, fnCallback ) {
             $.ajax( {
+                "cache": false,
                 "dataType": 'json', 
                 "type": "POST", 
                 "url": sSource, 

From d5c2c37a3eb26be60852833a1150122df1c0b6be Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Fri, 19 Oct 2012 11:16:42 -0400
Subject: [PATCH 35/38] Revert "CC-4605: Some AJAX calls are cached"

This reverts commit ffca5b42a89e7ffbf4725cdf0494c2847feffe2b.
---
 airtime_mvc/public/js/airtime/dashboard/dashboard.js  |  2 +-
 airtime_mvc/public/js/airtime/library/library.js      |  3 ---
 airtime_mvc/public/js/airtime/nowplaying/register.js  |  2 --
 .../public/js/airtime/playouthistory/historytable.js  |  3 +--
 airtime_mvc/public/js/airtime/schedule/schedule.js    |  5 +----
 airtime_mvc/public/js/airtime/showbuilder/builder.js  |  4 ----
 .../public/js/airtime/showbuilder/main_builder.js     |  3 ---
 airtime_mvc/public/js/airtime/user/user.js            | 11 ++---------
 8 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 741c5b4fa..98a167238 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -360,7 +360,7 @@ function controlSwitchLight(){
 }
 
 function getScheduleFromServer(){
-    $.ajax({ cache: false, url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
+    $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
                 parseItems(data.entries);
                 parseSourceStatus(data.source_status);
                 parseSwitchStatus(data.switch_status);
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index cfab12c6b..a832134c1 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -479,7 +479,6 @@ var AIRTIME = (function(AIRTIME) {
             "fnStateSave": function (oSettings, oData) {
                 localStorage.setItem('datatables-library', JSON.stringify(oData));
                 $.ajax({
-                    cache: false,
                     url: "/usersettings/set-library-datatable",
                     type: "POST",
                     data: {settings : oData, format: "json"},
@@ -543,7 +542,6 @@ var AIRTIME = (function(AIRTIME) {
                 aoData.push( { name: "type", value: type} );
             
                 $.ajax( {
-                    "cache": false,
                     "dataType": 'json',
                     "type": "POST",
                     "url": sSource,
@@ -885,7 +883,6 @@ var AIRTIME = (function(AIRTIME) {
                 }
                 
                 request = $.ajax({
-                  cache: false,
                   url: "/library/context-menu",
                   type: "GET",
                   data: {id : data.id, type: data.ftype, format: "json", "screen": screen},
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index 068f0d11a..0b5b04249 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -21,7 +21,6 @@ $(document).ready(function(){
                 click: function() {
                     var url = '/Usersettings/remindme';
                     $.ajax({
-                        cache: false,
                         url: url,
                         data: {format:"json"}
                     });
@@ -35,7 +34,6 @@ $(document).ready(function(){
                 click: function() {
                     var url ='/Usersettings/remindme-never';
                     $.ajax({
-                        cache: false,
                         url: url,
                         data: {format:"json"}
                     });
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index 0371fada5..9a0db2680 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -54,7 +54,6 @@ var AIRTIME = (function(AIRTIME) {
             aoData.push( { name: "format", value: "json"} );
             
             $.ajax( {
-                "cache": false,
                 "dataType": 'json',
                 "type": "GET",
                 "url": sSource,
@@ -184,4 +183,4 @@ $(document).ready(function(){
 		oTable.fnDraw();
 	});
 	
-});
+});
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index 3bddc60f5..5a43f1eb2 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -36,7 +36,6 @@ function confirmCancelShow(show_instance_id){
     if (confirm('Cancel Current Show?')) {
         var url = "/Schedule/cancel-current-show";
         $.ajax({
-            cache: false,
             url: url,
             data: {format: "json", id: show_instance_id},
             success: function(data){
@@ -51,7 +50,6 @@ function confirmCancelRecordedShow(show_instance_id){
         var url = "/Schedule/cancel-current-show";
         $.ajax({
             url: url,
-            cache: false,
             data: {format: "json", id: show_instance_id},
             success: function(data){
                 scheduleRefetchEvents(data);
@@ -291,7 +289,7 @@ function alertShowErrorAndReload(){
 }
 
 $(document).ready(function() {
-    $.ajax({ cache: false, url: "/Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
+    $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
             , error:function(jqXHR, textStatus, errorThrown){}});
     
     setInterval(checkCalendarSCUploadStatus, 5000);
@@ -461,7 +459,6 @@ $(document).ready(function() {
             }
             
             $.ajax({
-              cache: false,
               url: "/schedule/make-context-menu",
               type: "GET",
               data: {id : data.id, format: "json"},
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 8bcfbdc4a..9839df06c 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -326,7 +326,6 @@ var AIRTIME = (function(AIRTIME){
         }
         
         $.ajax({
-            "cache": false,
             "dataType": "json",
             "type": "POST",
             "url": sSource,
@@ -380,7 +379,6 @@ var AIRTIME = (function(AIRTIME){
                 localStorage.setItem('datatables-timeline', JSON.stringify(oData));
                 
                 $.ajax({
-                  cache: false,
                   url: "/usersettings/set-timeline-datatable",
                   type: "POST",
                   data: {settings : oData, format: "json"},
@@ -1005,7 +1003,6 @@ var AIRTIME = (function(AIRTIME){
                     if (confirm(msg)) {
                         var url = "/Schedule/cancel-current-show";
                         $.ajax({
-                            cache: false,
                             url: url,
                             data: {format: "json", id: data.instance},
                             success: function(data){
@@ -1184,7 +1181,6 @@ var AIRTIME = (function(AIRTIME){
                 }
                 
                 request = $.ajax({
-                  cache: false,
                   url: "/showbuilder/context-menu",
                   type: "GET",
                   data: {id : data.id, format: "json"},
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 60a224838..b640a2882 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -168,7 +168,6 @@ AIRTIME = (function(AIRTIME) {
 			schedTable.fnDraw();
 			
 			$.ajax({
-                cache: false,
 	            url: "/usersettings/set-now-playing-screen-settings",
 	            type: "POST",
 	            data: {settings : {library : true}, format: "json"},
@@ -193,7 +192,6 @@ AIRTIME = (function(AIRTIME) {
 			schedTable.fnDraw();
 			
 			$.ajax({
-                cache: false,
 	            url: "/usersettings/set-now-playing-screen-settings",
 	            type: "POST",
 	            data: {settings : {library : false}, format: "json"},
@@ -259,7 +257,6 @@ AIRTIME = (function(AIRTIME) {
 			}
 			
 			$.ajax( {
-                "cache": false,
 				"dataType": "json",
 				"type": "GET",
 				"url": "/showbuilder/check-builder-feed",
diff --git a/airtime_mvc/public/js/airtime/user/user.js b/airtime_mvc/public/js/airtime/user/user.js
index a6ae9b3f8..5c8278914 100644
--- a/airtime_mvc/public/js/airtime/user/user.js
+++ b/airtime_mvc/public/js/airtime/user/user.js
@@ -24,19 +24,13 @@ function populateForm(entries){
 }
 
 function rowClickCallback(row_id){
-      $.ajax({ cache: false,
-             url: '/User/get-user-data/id/'+ row_id +'/format/json', 
-             dataType:"json", 
-             success:function(data){
+      $.ajax({ url: '/User/get-user-data/id/'+ row_id +'/format/json', dataType:"json", success:function(data){
         populateForm(data.entries);
 	  }});    
 }
 
 function removeUserCallback(row_id, nRow){
-      $.ajax({ cache: false,
-             url: '/User/remove-user/id/'+ row_id +'/format/json', 
-             dataType:"text", 
-             success:function(data){
+      $.ajax({ url: '/User/remove-user/id/'+ row_id +'/format/json', dataType:"text", success:function(data){
         var o = $('#users_datatable').dataTable().fnDeleteRow(nRow);
 	  }});
 }
@@ -73,7 +67,6 @@ $(document).ready(function() {
         "sAjaxSource": "/User/get-user-data-table-info/format/json",
         "fnServerData": function ( sSource, aoData, fnCallback ) {
             $.ajax( {
-                "cache": false,
                 "dataType": 'json', 
                 "type": "POST", 
                 "url": sSource, 

From f5051cff3a31540f6e28aa9c33890505738ff73b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@thinkpad-t410>
Date: Fri, 19 Oct 2012 11:22:44 -0400
Subject: [PATCH 36/38] CC-4605: Some AJAX calls are cached

-fixed
---
 airtime_mvc/application/Bootstrap.php              | 3 +--
 airtime_mvc/public/js/airtime/airtime_bootstrap.js | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 airtime_mvc/public/js/airtime/airtime_bootstrap.js

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index c4c53ffa5..cb35a8a9c 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -75,6 +75,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view->headScript()->appendScript("var baseUrl='$baseUrl/'");
 
         //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');
@@ -91,8 +92,6 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         }
         $view->headScript()->appendScript("var userType = '$userType';");
 
-
-
         if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1) {
             $view->headScript()->appendFile($baseUrl.'/js/libs/google-analytics.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         }
diff --git a/airtime_mvc/public/js/airtime/airtime_bootstrap.js b/airtime_mvc/public/js/airtime/airtime_bootstrap.js
new file mode 100644
index 000000000..632d61627
--- /dev/null
+++ b/airtime_mvc/public/js/airtime/airtime_bootstrap.js
@@ -0,0 +1,5 @@
+$(document).ready(function() {
+    $.ajaxSetup({
+      cache: false
+    });
+});

From 8d56c03fe3e198f944513069c80bd7a399675156 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Fri, 19 Oct 2012 11:32:35 -0400
Subject: [PATCH 37/38] deep voodoo magic to optimize schedule

---
 airtime_mvc/application/models/Show.php       |  4 ++--
 .../application/models/ShowInstance.php       | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index bb58409fd..5da348b52 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1789,9 +1789,9 @@ SQL;
 
             $showInstance = new Application_Model_ShowInstance(
                 $show["instance_id"]);
-            $showContent = $showInstance->getShowListContent();
+            //$showContent = $showInstance->getShowListContent();
 
-            $options["show_empty"] = empty($showContent) ? 1 : 0;
+            $options["show_empty"] = ($showInstance->showEmpty()) ? 1 : 0;
 
             $events[] = &self::makeFullCalendarEvent($show, $options,
                 $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 3dfd8756f..e657494f9 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -661,6 +661,28 @@ SQL;
         return $returnStr;
     }
 
+
+    public function showEmpty()
+    {
+        $sql = <<<SQL
+SELECT s.starts
+FROM cc_schedule AS s
+WHERE s.instance_id = :instance_id
+  AND s.playout_status >= 0
+  AND ((s.stream_id IS NOT NULL)
+       OR (s.file_id IS NOT NULL)) LIMIT 1
+SQL;
+        # TODO : use prepareAndExecute properly
+        $res = Application_Common_Database::prepareAndExecute($sql,
+            array( ':instance_id' => $this->_instanceId ), 'all' );
+        # TODO : A bit retarded. fix this later
+        foreach ($res as $r) {
+            return false;
+        }
+        return true;
+
+    }
+
     public function getShowListContent()
     {
         $con = Propel::getConnection();

From a51c3174e0f18f844b312d4c1ea401f2098d74d8 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Fri, 19 Oct 2012 12:33:12 -0400
Subject: [PATCH 38/38] SAAS-282: Overlap detection prevents creation of a
 repeating show

-fixed
---
 airtime_mvc/application/forms/AddShowWhen.php | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index 1ed9d2619..e6d164022 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -143,10 +143,12 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
          * upto this point
          */
         if ($valid) {
+            $utc = new DateTimeZone('UTC');
+            $localTimezone = new DateTimeZone(Application_Model_Preference::GetTimezone());
             $show_start = new DateTime($start_time);
-            $show_start->setTimezone(new DateTimeZone('UTC'));
+            $show_start->setTimezone($utc);
             $show_end = new DateTime($end_time);
-            $show_end->setTimezone(new DateTimeZone('UTC'));
+            $show_end->setTimezone($utc);
 
             if ($formData["add_show_repeats"]) {
 
@@ -155,7 +157,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                     $date = Application_Model_Preference::GetShowsPopulatedUntil();
 
                     if (is_null($date)) {
-                        $populateUntilDateTime = new DateTime("now", new DateTimeZone('UTC'));
+                        $populateUntilDateTime = new DateTime("now", $utc);
                         Application_Model_Preference::SetShowsPopulatedUntil($populateUntilDateTime);
                     } else {
                         $populateUntilDateTime = clone $date;
@@ -164,7 +166,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                 } elseif (!$formData["add_show_no_end"]) {
                     $popUntil = $formData["add_show_end_date"]." ".$formData["add_show_end_time"];
                     $populateUntilDateTime = new DateTime($popUntil);
-                    $populateUntilDateTime->setTimezone(new DateTimeZone('UTC'));
+                    $populateUntilDateTime->setTimezone($utc);
                 }
 
                 //get repeat interval
@@ -203,8 +205,18 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                             else
                                 $daysAdd = $day - $startDow;
 
+                            /* In case we are crossing daylights saving time we need
+                             * to convert show start and show end to local time before
+                             * adding the interval for the next repeating show
+                             */
+                            
+                            $repeatShowStart->setTimezone($localTimezone);
+                            $repeatShowEnd->setTimezone($localTimezone);
                             $repeatShowStart->add(new DateInterval("P".$daysAdd."D"));
                             $repeatShowEnd->add(new DateInterval("P".$daysAdd."D"));
+                            //set back to UTC
+                            $repeatShowStart->setTimezone($utc);
+                            $repeatShowEnd->setTimezone($utc);
                         }
                         /* Here we are checking each repeating show by
                          * the show day.
@@ -238,8 +250,12 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                                 $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
                                 break 1;
                             } else {
+                                $repeatShowStart->setTimezone($localTimezone);
+                                $repeatShowEnd->setTimezone($localTimezone);
                                 $repeatShowStart->add(new DateInterval($interval));
                                 $repeatShowEnd->add(new DateInterval($interval));
+                                $repeatShowStart->setTimezone($utc);
+                                $repeatShowEnd->setTimezone($utc);
                             }
                         }
                     }