Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4732: Ask for admin username + password in Stream Settings page

Browse source 
- CRLF
This commit is contained in:
James 2013-01-03 18:02:19 -05:00
parent 5d76bb2d17
commit 63c847080f
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
airtime_mvc/application/forms/StreamSettingSubForm.php
View file

@ -191,28 +191,28 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
$user->setAttrib('alt', 'regular_text'); $user->setAttrib('alt', 'regular_text');
$this->addElement($user); $this->addElement($user);
$adminUser = new Zend_Form_Element_Text('admin_user'); $adminUser = new Zend_Form_Element_Text('admin_user');
$adminUser->setLabel(_("Admin User")) $adminUser->setLabel(_("Admin User"))
->setValue(Application_Model_StreamSetting::getAdminUser($prefix)) ->setValue(Application_Model_StreamSetting::getAdminUser($prefix))
->setValidators(array( ->setValidators(array(
array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered'))))) array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
if ($disable_all) { if ($disable_all) {
$adminUser->setAttrib("disabled", "disabled"); $adminUser->setAttrib("disabled", "disabled");
} }
$adminUser->setAttrib('alt', 'regular_text'); $adminUser->setAttrib('alt', 'regular_text');
$this->addElement($adminUser); $this->addElement($adminUser);
$adminPass = new Zend_Form_Element_Text('admin_pass'); $adminPass = new Zend_Form_Element_Text('admin_pass');
$adminPass->setLabel(_("Admin Password")) $adminPass->setLabel(_("Admin Password"))
->setValue(Application_Model_StreamSetting::getAdminPass($prefix)) ->setValue(Application_Model_StreamSetting::getAdminPass($prefix))
->setValidators(array( ->setValidators(array(
array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered'))))) array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
if ($disable_all) { if ($disable_all) {
$adminPass->setAttrib("disabled", "disabled"); $adminPass->setAttrib("disabled", "disabled");
} }
$adminPass->setAttrib('alt', 'regular_text'); $adminPass->setAttrib('alt', 'regular_text');
$this->addElement($adminPass); $this->addElement($adminPass);
$liquidsopa_error_msg = '<div class="stream-status status-info"><h3>'._('Getting information from the server...').'</h3></div>'; $liquidsopa_error_msg = '<div class="stream-status status-info"><h3>'._('Getting information from the server...').'</h3></div>';

12
airtime_mvc/application/models/StreamSetting.php
View file

@ -442,11 +442,11 @@ class Application_Model_StreamSetting
self::setValue($stream."_admin_user", $v, "string"); self::setValue($stream."_admin_user", $v, "string");
} }
public static function getAdminPass($stream){ public static function getAdminPass($stream){
return self::getValue($stream."_admin_pass"); return self::getValue($stream."_admin_pass");
} }
public static function setAdminPass($stream, $v){ public static function setAdminPass($stream, $v){
self::setValue($stream."_admin_pass", $v, "string"); self::setValue($stream."_admin_pass", $v, "string");
} }
} }