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

- fix spelling of some function name

Browse source
This commit is contained in:
James 2012-10-17 15:16:03 -04:00
parent 07968e9db1
commit 45801e5dc4
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -830,8 +830,8 @@ class ApiController extends Zend_Controller_Action
if ($djtype == 'master') { if ($djtype == 'master') {
//check against master //check against master
if ($username == Application_Model_Preference::GetLiveSteamMasterUsername() if ($username == Application_Model_Preference::GetLiveStreamMasterUsername()
&& $password == Application_Model_Preference::GetLiveSteamMasterPassword()) { && $password == Application_Model_Preference::GetLiveStreamMasterPassword()) {
$this->view->msg = true; $this->view->msg = true;
} else { } else {
$this->view->msg = false; $this->view->msg = false;

4
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -220,8 +220,8 @@ class PreferenceController extends Zend_Controller_Action
// this goes into cc_pref table // this goes into cc_pref table
Application_Model_Preference::SetStreamLabelFormat($values['streamFormat']); Application_Model_Preference::SetStreamLabelFormat($values['streamFormat']);
Application_Model_Preference::SetLiveSteamMasterUsername($values["master_username"]); Application_Model_Preference::SetLiveStreamMasterUsername($values["master_username"]);
Application_Model_Preference::SetLiveSteamMasterPassword($values["master_password"]); Application_Model_Preference::SetLiveStreamMasterPassword($values["master_password"]);
Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]); Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]);
Application_Model_Preference::SetAutoTransition($values["auto_transition"]); Application_Model_Preference::SetAutoTransition($values["auto_transition"]);
Application_Model_Preference::SetAutoSwitch($values["auto_switch"]); Application_Model_Preference::SetAutoSwitch($values["auto_switch"]);

4
airtime_mvc/application/forms/LiveStreamingPreferences.php
View file

@ -45,7 +45,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
->setAllowEmpty(true) ->setAllowEmpty(true)
->setLabel('Master Username') ->setLabel('Master Username')
->setFilters(array('StringTrim')) ->setFilters(array('StringTrim'))
->setValue(Application_Model_Preference::GetLiveSteamMasterUsername()) ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername())
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
$this->addElement($master_username); $this->addElement($master_username);
@ -59,7 +59,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
$master_password->setAttrib('autocomplete', 'off') $master_password->setAttrib('autocomplete', 'off')
->setAttrib('renderPassword','true') ->setAttrib('renderPassword','true')
->setAllowEmpty(true) ->setAllowEmpty(true)
->setValue(Application_Model_Preference::GetLiveSteamMasterPassword()) ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword())
->setLabel('Master Password') ->setLabel('Master Password')
->setFilters(array('StringTrim')) ->setFilters(array('StringTrim'))
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));

8
airtime_mvc/application/models/Preference.php
View file

@ -892,22 +892,22 @@ class Application_Model_Preference
return (strlen($val) == 0) ? 0 : $val; return (strlen($val) == 0) ? 0 : $val;
} }
public static function SetLiveSteamMasterUsername($value) public static function SetLiveStreamMasterUsername($value)
{ {
self::setValue("live_stream_master_username", $value, false); self::setValue("live_stream_master_username", $value, false);
} }
public static function GetLiveSteamMasterUsername() public static function GetLiveStreamMasterUsername()
{ {
return self::getValue("live_stream_master_username"); return self::getValue("live_stream_master_username");
} }
public static function SetLiveSteamMasterPassword($value) public static function SetLiveStreamMasterPassword($value)
{ {
self::setValue("live_stream_master_password", $value, false); self::setValue("live_stream_master_password", $value, false);
} }
public static function GetLiveSteamMasterPassword() public static function GetLiveStreamMasterPassword()
{ {
return self::getValue("live_stream_master_password"); return self::getValue("live_stream_master_password");
} }