From 68f142470abb974ef261f0bb58a8aaad472c889f Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Sun, 13 Nov 2011 13:58:47 -0500
Subject: [PATCH] SAAS-67: "Hardware Audio Out" shows when SaaS is enabled

- "Hardware Audio Out" is not visible when plan-level is not diabled
---
 .../application/controllers/PreferenceController.php        | 6 ++++--
 .../views/scripts/preference/stream-setting.phtml           | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 414f3dae2..6a8237ccf 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -160,8 +160,10 @@ class PreferenceController extends Zend_Controller_Action
 
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         $form = new Application_Form_StreamSetting();
-        $form->setSetting($setting);
-        $form->startFrom();
+        if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
+            $form->setSetting($setting);
+            $form->startFrom();
+        }
         for($i=1; $i<=$num_of_stream; $i++){
             $subform = new Application_Form_StreamSettingSubForm();
             $subform->setPrefix($i);
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index b86bbc855..d250be0cd 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -8,6 +8,7 @@
     <div style="clear:both"></div>
     <?php }?>
 <?php echo $this->statusMsg;?>
+<?php if($this->form->getElement('output_sound_device') != null){?>
     <fieldset class="padded">
         <legend>Hardware Audio Out</legend>
         <dl class="zend_form">
@@ -21,6 +22,7 @@
             </dd>
         </dl>
     </fieldset>
+<?php } ?>
     <?php
         for($i=1;$i<=$this->num_stream;$i++){
             echo $this->form->getSubform("s".$i."_subform");