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

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["selCurs"] = array("name"=> "Select cursor","icon" => "select-cursor");
-        $menu["delCurs"] = array("name"=> "Remove 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;

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;
                         

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'),
+            'filters'    => array('StringTrim')
-            'validators' => array('Int'),
-            'required' => true
         ));
 
         // Add genre field

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

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;

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;

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;

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='blockId' style="display: none;"><?php echo "$this->blockId" ?></span>
-    <span class='blockIndex'><?php echo "$this->blockIndex" ?></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>

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:?>

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

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

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;

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;