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

airtime_mvc/application/forms/GeneralPreferences.php

@@ -8,7 +8,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
     {
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $this->isSaas = $isSaas; 
-        Logging::log($this->isSaas==true?"true":"false"); 
         
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/preferences_general.phtml', "isSaas" => $isSaas))

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -85,6 +85,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
         $l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
         $l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         
         $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
         $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
@@ -100,7 +101,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         }
         
         $this->setDecorators(array(
-        array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url))
+        array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isSaas' => $isSaas))
         ));
     }
     

airtime_mvc/application/models/Show.php

@@ -1764,7 +1764,6 @@ class Application_Model_Show {
 
         for( $i = 0; $i < $numberOfRows; ++$i ){
             //Find the show that is within the current time.
-            $rows[$i]['type'] = 'show';
             if ((strtotime($rows[$i]['starts']) <= $timeNowAsMillis) && (strtotime($rows[$i]['ends']) >= $timeNowAsMillis)){
                 if ( $i - 1 >= 0){
                     $results['previousShow'][0] = array(
@@ -1776,7 +1775,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i-1]['end_timestamp'],
                                 "starts"=>$rows[$i-1]['starts'],
                                 "ends"=>$rows[$i-1]['ends'],
-                                "type"=>$rows[$i-1]['type']);
+                                "type"=>"show");
                 }
 
                 $results['currentShow'][0] =  $rows[$i];
@@ -1791,7 +1790,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i+1]['end_timestamp'],
                                 "starts"=>$rows[$i+1]['starts'],
                                 "ends"=>$rows[$i+1]['ends'],
-                                "type"=>$rows[$i+1]['type']);
+                                "type"=>"show");
 
                 }
                 break;
@@ -1811,7 +1810,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i]['end_timestamp'],
                                 "starts"=>$rows[$i]['starts'],
                                 "ends"=>$rows[$i]['ends'],
-                                "type"=>$rows[$i]['type']);
+                                "type"=>"show");
                 break;
             }
         }
@@ -1826,7 +1825,7 @@ class Application_Model_Show {
                     "end_timestamp"=>$rows[$previousShowIndex]['end_timestamp'],
                     "starts"=>$rows[$previousShowIndex]['starts'],
                     "ends"=>$rows[$previousShowIndex]['ends'],
-                    "type"=>$rows[$previousShowIndex]['type']);
+                    "type"=>"show");
         }
         
         return $results;

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

@@ -43,6 +43,7 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+        <?php if( !$this->isSaas ){?>
             <dt id="master_harbor_input_port-label">
                 <label class="optional" for="master_harbor_input_port"><?php echo $this->element->getElement('master_harbor_input_port')->getLabel() ?> :
                 </label>
@@ -71,16 +72,21 @@
                     </ul>
                 <?php endif; ?> 
             </dd>
+        <?php } ?>
         <dt id="master_dj_connection_url-label">
             <label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL:
             </label>
         </dt>
         <dd id="master_dj_connection_url-element">
-            <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>  <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
+            <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>
+            <?php if( !$this->isSaas ){?>
+                <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
+            <?php } ?>
             <div id="master_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a></div>
         </dd>
+        <?php if( !$this->isSaas ){?>
             <dt id="dj_harbor_input_port-label">
                 <label class="optional" for="dj_harbor_input_port"><?php echo $this->element->getElement('dj_harbor_input_port')->getLabel() ?> :
                 </label>
@@ -109,14 +115,18 @@
                     </ul>
                 <?php endif; ?> 
             </dd>
+        <?php } ?>
         <dt id="live_dj_connection_url-label">
             <label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL:
             </label>
         </dt>
         <dd id="live_dj_connection_url-element">
-            <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>  <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
+            <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>
+            <?php if( !$this->isSaas ){?>   
+                <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
+            <?php } ?>
             <div id="live_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a></div>
         </dd>
     </dl>