SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance

-fixed

airtime_mvc/application/controllers/PreferenceController.php

@@ -144,6 +144,8 @@ class PreferenceController extends Zend_Controller_Action
 
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
     
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
+
         // get current settings
         $temp = Application_Model_StreamSetting::getStreamSetting();
         $setting = array();
@@ -197,13 +199,12 @@ class PreferenceController extends Zend_Controller_Action
             $values = $post_data;
             
             if($form->isValid($post_data)){
-                if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
+                if (!$isSaas) {
                     $values['output_sound_device'] = $form->getValue('output_sound_device');
+                    $values['output_sound_device_type'] = $form->getValue('output_sound_device_type');
                 }
 
-
                 $values['icecast_vorbis_metadata'] = $form->getValue('icecast_vorbis_metadata');
-                $values['output_sound_device_type'] = $form->getValue('output_sound_device_type');
                 $values['streamFormat'] = $form->getValue('streamFormat');
 
                 Application_Model_StreamSetting::setStreamSetting($values);
@@ -214,6 +215,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetLiveSteamMasterPassword($values["master_password"]);
                 Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]);
                 
+                if (!$isSaas) {
                     $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_harbor_input_port"]."/".$values["master_harbor_input_mount_point"];
                     $live_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["dj_harbor_input_port"]."/".$values["dj_harbor_input_mount_point"];
                 
@@ -225,6 +227,7 @@ class PreferenceController extends Zend_Controller_Action
                     Application_Model_StreamSetting::SetMasterLiveSteamMountPoint($values["master_harbor_input_mount_point"]);
                     Application_Model_StreamSetting::SetDJLiveSteamPort($values["dj_harbor_input_port"]);
                     Application_Model_StreamSetting::SetDJLiveSteamMountPoint($values["dj_harbor_input_mount_point"]);
+                }
                 
                 // store stream update timestamp
                 Application_Model_Preference::SetStreamUpdateTimestamp();

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -5,6 +5,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
     
     public function init()
     {
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
         if($defaultFade == ""){
             $defaultFade = '00.000000';
@@ -42,6 +43,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $this->addElement($master_password);
         
         //liquidsoap harbor.input port
+        if (!$isSaas) {
             $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
             $master_dj_port = new Zend_Form_Element_Text('master_harbor_input_port');
             $master_dj_port->setLabel("Master Source Port")
@@ -79,6 +81,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($live_dj_mount);
         }
+    }
     
     public function updateVariables(){
         $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
@@ -106,8 +109,9 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
     }
     
     public function isValid($data){
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $isValid = parent::isValid($data);
-        
+        if (!$isSaas) {
             $master_harbor_input_port = $data['master_harbor_input_port'];
             $dj_harbor_input_port = $data['dj_harbor_input_port'];
             
@@ -147,6 +151,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                     $isValid = false;
                 }
             }
+        }
         return $isValid;
     }