From 9fe31a5923ed48f71fbb6014d3ed50eef2cbfe4a Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Thu, 16 Mar 2017 22:30:08 -0400 Subject: [PATCH] minor code clean-up --- .../controllers/PreferenceController.php | 1 + .../forms/LiveStreamingPreferences.php | 90 +++++++++---------- 2 files changed, 44 insertions(+), 47 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 29f948960..f4dcdd897 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -264,6 +264,7 @@ class PreferenceController extends Zend_Controller_Action // pulling this from the 2.5.x branch if (!Application_Model_Preference::GetMasterDjConnectionUrlOverride()) { + $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_source_port"].$values["master_source_mount"]; if (empty($values["master_source_port"]) || empty($values["master_source_port"])) { Application_Model_Preference::SetMasterDJSourceConnectionURL('N/A'); } else { diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index 9c857be73..675d6be18 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -12,52 +12,52 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $defaultFade = Application_Model_Preference::GetDefaultTransitionFade(); $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml')), - )); + array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml')), + )); // automatic trasition on source disconnection $auto_transition = new Zend_Form_Element_Checkbox("auto_transition"); $auto_transition->setLabel(_("Auto Switch Off:")) - ->setValue(Application_Model_Preference::GetAutoTransition()); + ->setValue(Application_Model_Preference::GetAutoTransition()); $this->addElement($auto_transition); // automatic switch on upon source connection $auto_switch = new Zend_Form_Element_Checkbox("auto_switch"); $auto_switch->setLabel(_("Auto Switch On:")) - ->setValue(Application_Model_Preference::GetAutoSwitch()); + ->setValue(Application_Model_Preference::GetAutoSwitch()); $this->addElement($auto_switch); // Default transition fade $transition_fade = new Zend_Form_Element_Text("transition_fade"); $transition_fade->setLabel(_("Switch Transition Fade (s):")) - ->setFilters(array('StringTrim')) - ->addValidator('regex', false, array('/^\d*(\.\d+)?$/', - 'messages' => _('Please enter a time in seconds (eg. 0.5)'))) - ->setValue($defaultFade); + ->setFilters(array('StringTrim')) + ->addValidator('regex', false, array('/^\d*(\.\d+)?$/', + 'messages' => _('Please enter a time in seconds (eg. 0.5)'))) + ->setValue($defaultFade); $this->addElement($transition_fade); //Master username $master_username = new Zend_Form_Element_Text('master_username'); $master_username->setAttrib('autocomplete', 'off') - ->setAllowEmpty(true) - ->setLabel(_('Username:')) - ->setFilters(array('StringTrim')) - ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername()); + ->setAllowEmpty(true) + ->setLabel(_('Username:')) + ->setFilters(array('StringTrim')) + ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername()); $this->addElement($master_username); //Master password if ($isDemo) { - $master_password = new Zend_Form_Element_Text('master_password'); + $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 = new Zend_Form_Element_Password('master_password'); + $master_password->setAttrib('renderPassword', 'true'); } $master_password->setAttrib('autocomplete', 'off') - ->setAttrib('renderPassword','true') - ->setAllowEmpty(true) - ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword()) - ->setLabel(_('Password:')) - ->setFilters(array('StringTrim')); + ->setAttrib('renderPassword', 'true') + ->setAllowEmpty(true) + ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword()) + ->setLabel(_('Password:')) + ->setFilters(array('StringTrim')); $this->addElement($master_password); $masterSourceParams = parse_url(Application_Model_Preference::GetMasterDJSourceConnectionURL()); @@ -69,16 +69,20 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm ->setValue(Application_Model_Preference::GetMasterDJSourceConnectionURL()); $this->addElement($masterSourceHost); + //liquidsoap harbor.input port $betweenValidator = Application_Form_Helper_ValidationTypes::overrideBetweenValidator(1024, 49151); + $m_port = Application_Model_StreamSetting::getMasterLiveStreamPort(); + $masterSourcePort = new Zend_Form_Element_Text('master_source_port'); $masterSourcePort->setLabel(_('Master Source Port:')) ->setValue($m_port) - ->setValidators(array($betweenValidator)) ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>_('Only numbers are allowed.')))); - $this->addElement($masterSourcePort); + $this->addElement($masterSourcePort); + + $m_mount = Application_Model_StreamSetting::getMasterLiveStreamMountPoint(); $masterSourceMount = new Zend_Form_Element_Text('master_source_mount'); @@ -104,7 +108,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $showSourcePort->setLabel(_('Show Source Port:')) ->setValue($l_port) ->setValidators(array($betweenValidator)) - ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>_('Only numbers are allowed.')))); + ->addValidator('regex', false, array('pattern' => '/^[0-9]+$/', 'messages' => array('regexNotMatch' => _('Only numbers are allowed.')))); $this->addElement($showSourcePort); $l_mount = Application_Model_StreamSetting::getDjLiveStreamMountPoint(); @@ -114,16 +118,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm ->setValidators(array( array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered'))))); $this->addElement($showSourceMount); - - // demo only code - if ($isDemo) { - $elements = $this->getElements(); - foreach ($elements as $element) { - if ($element->getType() != 'Zend_Form_Element_Hidden') { - $element->setAttrib("disabled", "disabled"); - } - } - } } public function updateVariables() @@ -135,26 +129,28 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $showSourceParams = parse_url(Application_Model_Preference::GetLiveDJSourceConnectionURL()); $this->setDecorators( - array ( - array ('ViewScript', - array ( - 'viewScript' => 'form/preferences_livestream.phtml', - 'master_source_host' => isset($masterSourceHost)?$masterSourceParams["host"]:"", - 'master_source_port' => isset($masterSourcePort)?$masterSourceParams["port"]:"", - 'master_source_mount' => isset($masterSourceMount)?$masterSourceParams["path"]:"", - 'show_source_host' => isset($showSourceHost)?$showSourceParams["host"]:"", - 'show_source_port' => isset($showSourcePort)?$showSourceParams["port"]:"", - 'show_source_mount' => isset($showSourceMount)?$showSourceParams["path"]:"", - 'isDemo' => $isDemo, + array( + array('ViewScript', + array( + 'viewScript' => 'form/preferences_livestream.phtml', + 'master_source_host' => isset($masterSourceHost) ? Application_Model_Preference::GetMasterDJSourceConnectionURL() : "", + 'master_source_port' => isset($masterSourcePort) ? Application_Model_StreamSetting::getMasterLiveStreamPort() : "", + 'master_source_mount' => isset($masterSourceMount) ? Application_Model_StreamSetting::getMasterLiveStreamMountPoint() : "", + 'show_source_host' => isset($showSourceHost) ? Application_Model_Preference::GetLiveDJSourceConnectionURL() : "", + 'show_source_port' => isset($showSourcePort) ? Application_Model_StreamSetting::getDjLiveStreamPort() : "", + 'show_source_mount' => isset($showSourceMount) ? Application_Model_StreamSetting::getDjLiveStreamMountPoint() : "", + 'isDemo' => $isDemo, ) ) ) ); } + public function isValid($data) { - return $isValid = parent::isValid($data); - } + $isValid = parent::isValid($data); -} + return $isValid; + } +} \ No newline at end of file