From 63c847080fa7b95462bab8d3e6a73ffb25dfd48d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 3 Jan 2013 18:02:19 -0500
Subject: [PATCH] CC-4732: Ask for admin username + password in Stream Settings
 page

- CRLF
---
 .../forms/StreamSettingSubForm.php            | 40 +++++++++----------
 .../application/models/StreamSetting.php      | 12 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/airtime_mvc/application/forms/StreamSettingSubForm.php b/airtime_mvc/application/forms/StreamSettingSubForm.php
index cb03ec83b..eea40d8a7 100644
--- a/airtime_mvc/application/forms/StreamSettingSubForm.php
+++ b/airtime_mvc/application/forms/StreamSettingSubForm.php
@@ -191,28 +191,28 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $user->setAttrib('alt', 'regular_text');
         $this->addElement($user);
         
-        $adminUser = new Zend_Form_Element_Text('admin_user');
-        $adminUser->setLabel(_("Admin User"))
-                         ->setValue(Application_Model_StreamSetting::getAdminUser($prefix))
-                         ->setValidators(array(
-                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
-                         ->setDecorators(array('ViewHelper'));
-        if ($disable_all) {
-            $adminUser->setAttrib("disabled", "disabled");
-        }
-        $adminUser->setAttrib('alt', 'regular_text');
+        $adminUser = new Zend_Form_Element_Text('admin_user');
+        $adminUser->setLabel(_("Admin User"))
+                         ->setValue(Application_Model_StreamSetting::getAdminUser($prefix))
+                         ->setValidators(array(
+                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
+                         ->setDecorators(array('ViewHelper'));
+        if ($disable_all) {
+            $adminUser->setAttrib("disabled", "disabled");
+        }
+        $adminUser->setAttrib('alt', 'regular_text');
         $this->addElement($adminUser);
         
-        $adminPass = new Zend_Form_Element_Text('admin_pass');
-        $adminPass->setLabel(_("Admin Password"))
-                         ->setValue(Application_Model_StreamSetting::getAdminPass($prefix))
-                         ->setValidators(array(
-                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
-                         ->setDecorators(array('ViewHelper'));
-        if ($disable_all) {
-            $adminPass->setAttrib("disabled", "disabled");
-        }
-        $adminPass->setAttrib('alt', 'regular_text');
+        $adminPass = new Zend_Form_Element_Text('admin_pass');
+        $adminPass->setLabel(_("Admin Password"))
+                         ->setValue(Application_Model_StreamSetting::getAdminPass($prefix))
+                         ->setValidators(array(
+                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
+                         ->setDecorators(array('ViewHelper'));
+        if ($disable_all) {
+            $adminPass->setAttrib("disabled", "disabled");
+        }
+        $adminPass->setAttrib('alt', 'regular_text');
         $this->addElement($adminPass);
 
         $liquidsopa_error_msg = '<div class="stream-status status-info"><h3>'._('Getting information from the server...').'</h3></div>';
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index 8fc29ba4f..790772897 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -442,11 +442,11 @@ class Application_Model_StreamSetting
         self::setValue($stream."_admin_user", $v, "string");
     }
     
-    public static function getAdminPass($stream){
-        return self::getValue($stream."_admin_pass");
-    }
-    
-    public static function setAdminPass($stream, $v){
-        self::setValue($stream."_admin_pass", $v, "string");
+    public static function getAdminPass($stream){
+        return self::getValue($stream."_admin_pass");
+    }
+    
+    public static function setAdminPass($stream, $v){
+        self::setValue($stream."_admin_pass", $v, "string");
     }
 }