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

airtime_mvc/application/controllers/ApiController.php

@@ -377,6 +377,7 @@ class ApiController extends Zend_Controller_Action
 
 
         $this->view->is_recording = false;
+        $this->view->server_timezone = Application_Model_Preference::GetTimezone();
 
         $rows = Application_Model_Show::GetCurrentShow($today_timestamp);
         Application_Model_Show::ConvertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp"));

airtime_mvc/application/controllers/PreferenceController.php

@@ -194,7 +194,7 @@ class PreferenceController extends Zend_Controller_Action
                 }
             }
             if($form->isValid($post_data)){
-                if(Application_Model_Preference::GetPlanLevel() == 'disabled'){// && $form->isValid($post_data['output_sound_device'])){
+                if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
                     $values['output_sound_device'] = $form->getValue('output_sound_device');
                 }
 

airtime_mvc/application/forms/StreamSetting.php

@@ -68,9 +68,15 @@ class Application_Form_StreamSetting extends Zend_Form
     }
 
     public function isValid($data){
-        if($data['output_sound_device']){
+        if(isset($data['output_sound_device'])){
-            $this->populate(array("output_sound_device"=>$data['output_sound_device'], "icecast_vorbis_metadata"=>$data['icecast_vorbis_metadata'],
+            $d = array();
-                                "output_sound_device_type"=>$data['output_sound_device_type'], "streamFormat"=>$data['streamFormat']));
+            $d["output_sound_device"] = $data['output_sound_device'];
+            $d["icecast_vorbis_metadata"] = $data['icecast_vorbis_metadata'];
+            if(isset($data['output_sound_device_type'])){
+                $d["output_sound_device_type"] = $data['output_sound_device_type'];
+            }
+            $d["streamFormat"] = $data['streamFormat'];
+            $this->populate($d);
         }
         return true;
     }

airtime_mvc/application/views/helpers/TrialRemaining.php

@@ -5,6 +5,9 @@ class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract
     public function trialRemaining()
     {
         $ending_date = Application_Model_Preference::GetTrialEndingDate();
+        if ($ending_date == '') {
+            return '';
+        }
         $datetime1 = new DateTime();
         $datetime2 = new DateTime($ending_date);
         $interval = $datetime1->diff($datetime2);

airtime_mvc/application/views/scripts/partialviews/header.phtml

@@ -36,15 +36,15 @@
       <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
     </ul>
   </div>
-  <?php if($this->is_trial){?>
+  <?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
   <div class="trial-box">
-      <p>Your Trial expires in</p>
+      <p>Your trial expires in</p>
       <div class="trial-box-calendar">
            <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
            <div class="trial-box-calendar-gray">days</div>
       </div>
       <div class="trial-box-button">
-            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank">Buy Now</a>
+            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank">My Account</a>
       </div>
   </div>
   <?php }?> 

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

@@ -125,6 +125,12 @@ $(document).ready(function() {
         rebuildStreamURL($(this))
     })
     
+    if(!$("#output_sound_device").is(':checked')){
+        $("select[id=output_sound_device_type]").attr('disabled', 'disabled')
+    }else{
+        $("select[id=output_sound_device_type]").removeAttr('disabled')
+    }
+    
     $("#output_sound_device").change(function(){
         if($(this).is(':checked')){
         	$("select[id=output_sound_device_type]").removeAttr('disabled')

install_full/ubuntu/airtime-full-install

@@ -52,10 +52,6 @@ if [ "$?" -ne "0" ]; then
    exit 1
 fi
 
-# Install phing
-pear channel-discover pear.phing.info
-pear install phing/phing-2.4.2
-
 # Apache Config File
 echo "----------------------------------------------------"
 echo "2. Apache Config File"

install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200

@@ -25,3 +25,5 @@ record_samplerate = 44100
 record_channels = 2
 record_sample_size = 16
 
+#can be either ogg|mp3, mp3 recording requires installation of the package "lame"
+record_file_type = 'ogg'

python_apps/show-recorder/recorder.py

@@ -270,13 +270,15 @@ class CommandListener():
                      'hour': start_time_on_server.hour, 'min': start_time_on_server.minute, 'sec': start_time_on_server.second}
                 self.sr = ShowRecorder(show_instance, show_name, show_length.seconds, start_time_formatted)
                 self.sr.start()
-
                 #remove show from shows to record.
                 del self.shows_to_record[start_time]
                 time_till_next_show = self.get_time_till_next_show()
                 self.time_till_next_show = time_till_next_show
             except Exception,e :
-                self.logger.error(e)
+                import traceback
+                top = traceback.format_exc()
+                self.logger.error('Exception: %s', e)
+                self.logger.error("traceback: %s", top)
         else:
             self.logger.debug("No recording scheduled...")
 
@@ -297,6 +299,7 @@ class CommandListener():
             temp = self.api_client.get_shows_to_record()
             if temp is not None:
                 shows = temp['shows']
+                self.server_timezone = temp['server_timezone']
                 self.parse_shows(shows)
             self.logger.info("Bootstrap complete: got initial copy of the schedule")
         except Exception, e: