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

CC-2706: Streams should have a username field

Browse source 
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
This commit is contained in:
James 2011-08-24 17:13:56 -04:00
parent 9eb21cb327
commit 58837ff89b
8 changed files with 136 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,74 +38,83 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
$enable = new Zend_Form_Element_Checkbox('enable');
$enable->setLabel('Enabled:')
->setValue($setting['output_'.$prefix] != 'disabled'?1:0)
->setValue($setting[$prefix.'_output'] != 'disabled'?1:0)
->setDecorators(array('ViewHelper'));
$this->addElement($enable);
$type = new Zend_Form_Element_Select('type');
$type->setLabel("Type:")
->setMultiOptions($stream_types)
->setValue($setting[$prefix.'_type'])
->setValue(isset($setting[$prefix.'_type'])?$setting[$prefix.'_type']:0)
->setDecorators(array('ViewHelper'));
$this->addElement($type);
$bitrate = new Zend_Form_Element_Select('bitrate');
$bitrate->setLabel("Bitrate:")
->setMultiOptions($stream_bitrates)
->setValue($setting[$prefix.'_bitrate'])
->setValue(isset($setting[$prefix.'_bitrate'])?$setting[$prefix.'_bitrate']:0)
->setDecorators(array('ViewHelper'));
$this->addElement($bitrate);
$output = new Zend_Form_Element_Select('output');
$output->setLabel("Output to:")
->setMultiOptions(array("icecast"=>"Icecast", "shoutcast"=>"Shoutcast"))
->setValue($setting['output_'.$prefix])
->setValue(isset($setting[$prefix.'_output'])?$setting[$prefix.'_output']:"icecast")
->setDecorators(array('ViewHelper'));
$this->addElement($output);
$host = new Zend_Form_Element_Text('host');
$host->setLabel("Server")
->setValue($setting[$prefix.'_host'])
->setValue(isset($setting[$prefix.'_host'])?$setting[$prefix.'_host']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($host);
$port = new Zend_Form_Element_Text('port');
$port->setLabel("Port")
->setValue($setting[$prefix.'_port'])
->setValue(isset($setting[$prefix.'_port'])?$setting[$prefix.'_port']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($port);
$pass = new Zend_Form_Element_Text('pass');
$pass->setLabel("Password")
->setValue($setting[$prefix.'_pass'])
->setValue(isset($setting[$prefix.'_pass'])?$setting[$prefix.'_pass']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($pass);
$genre = new Zend_Form_Element_Text('genre');
$genre->setLabel("Genre:")
->setValue($setting[$prefix.'_genre'])
$genre->setLabel("Genre")
->setValue(isset($setting[$prefix.'_genre'])?$setting[$prefix.'_genre']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($genre);
$url = new Zend_Form_Element_Text('url');
$url->setLabel("URL")
->setValue($setting[$prefix.'_url'])
->setValue(isset($setting[$prefix.'_url'])?$setting[$prefix.'_url']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($url);
$description = new Zend_Form_Element_Text('description');
$description->setLabel("Name/Description")
->setValue($setting[$prefix.'_description'])
->setValue(isset($setting[$prefix.'_description'])?$setting[$prefix.'_description']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($description);
$mount_info = explode('.',$setting[$prefix.'_mount']);
$mount_info = array();
if(isset($setting[$prefix.'_mount'])){
$mount_info = explode('.',$setting[$prefix.'_mount']);
}
$mount = new Zend_Form_Element_Text('mount');
$mount->setLabel("Mount Point")
->setValue($mount_info[0])
->setValue(isset($mount_info[0])?$mount_info[0]:"")
->setDecorators(array('ViewHelper'));
$this->addElement($mount);
$user = new Zend_Form_Element_Text('user');
$user->setLabel("Username")
->setValue(isset($setting[$prefix.'_user'])?$setting[$prefix.'_user']:"")
->setDecorators(array('ViewHelper'));
$this->addElement($user);
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/stream-setting-form.phtml', "stream_number"=>$stream_number))
));
@ -124,11 +133,6 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
$element->addError("Port cannot be empty.");
$isValid = false;
}
if($data['pass'] == ''){
$element = $this->getElement("pass");
$element->addError("Password cannot be empty.");
$isValid = false;
}
if($data['output'] == 'icecast'){
if($data['mount'] == ''){
$element = $this->getElement("mount");