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

airtime_mvc/application/forms/LiveStreamingPreferences.php

@@ -5,6 +5,10 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
     
     public function init()
     {
+        global $CC_CONFIG;
+        $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
+        $isStreamConfigable = Application_Model_Preference::GetEnableStreamConf() == "true";
+        
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
         if($defaultFade == ""){
@@ -32,7 +36,12 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $this->addElement($master_username);
         
         //Master password
+        if($isDemo){
+                $master_password = new Zend_Form_Element_Text('master_password');
+        }else{
                 $master_password = new Zend_Form_Element_Password('master_password');
+                $master_password->setAttrib('renderPassword','true');
+        }
         $master_password->setAttrib('autocomplete', 'off')
                         ->setAttrib('renderPassword','true')
                         ->setAllowEmpty(true)
@@ -81,14 +90,28 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($live_dj_mount);
         }
+        // demo only code
+        if(!$isStreamConfigable){
+            $elements = $this->getElements();
+            foreach ($elements as $element)
+            {
+                if ($element->getType() != 'Zend_Form_Element_Hidden')
+                {
+                    $element->setAttrib("disabled", "disabled");
+                }
+            }
+        }
     }
     
     public function updateVariables(){
+        global $CC_CONFIG;
+
         $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
         $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;
+        $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
 
         $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
         $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
@@ -104,7 +127,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, 'isSaas' => $isSaas))
+        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, 'isDemo' => $isDemo))
         ));
     }
     

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

@@ -79,7 +79,7 @@
         </dt>
         <dd id="master_dj_connection_url-element">
             <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>
-            <?php if( !$this->isSaas ){?>
+            <?php if( !$this->isSaas && !$this->isDemo){?>
                 <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
@@ -122,7 +122,7 @@
         </dt>
         <dd id="live_dj_connection_url-element">
             <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>
-            <?php if( !$this->isSaas ){?>   
+            <?php if( !$this->isSaas && !$this->isDemo ){?>   
                 <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>

python_apps/pypo/airtime-playout

@@ -23,6 +23,7 @@ fi
 export HOME="/var/tmp/airtime/pypo/"
 export PYTHONPATH=${api_client_path}:$PYTHONPATH
 export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
+export TERM=xterm
 
 # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr
 exec python -u ${pypo_path}${pypo_script} > /var/log/airtime/pypo/py-interpreter.log 2>&1