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

CC-4090: Make code style PSR compliant

Browse source 
StreamSetting.php
This commit is contained in:
Martin Konecny 2012-07-09 23:32:21 -04:00
parent dec68649c1
commit e91c96b90e
8 changed files with 194 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,10 +254,10 @@ class PreferenceController extends Zend_Controller_Action
}
// extra info that goes into cc_stream_setting
Application_Model_StreamSetting::SetMasterLiveSteamPort($values["master_harbor_input_port"]);
Application_Model_StreamSetting::SetMasterLiveSteamMountPoint($values["master_harbor_input_mount_point"]);
Application_Model_StreamSetting::SetDJLiveSteamPort($values["dj_harbor_input_port"]);
Application_Model_StreamSetting::SetDJLiveSteamMountPoint($values["dj_harbor_input_mount_point"]);
Application_Model_StreamSetting::setMasterLiveStreamPort($values["master_harbor_input_port"]);
Application_Model_StreamSetting::setMasterLiveStreamMountPoint($values["master_harbor_input_mount_point"]);
Application_Model_StreamSetting::setDjLiveStreamPort($values["dj_harbor_input_port"]);
Application_Model_StreamSetting::setDjLiveStreamMountPoint($values["dj_harbor_input_mount_point"]);
}
// store stream update timestamp

6
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -27,7 +27,7 @@ class ShowbuilderController extends Zend_Controller_Action
$userType = $user->getType();
$this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
$data = Application_Model_Preference::GetValue("library_datatable", true);
$data = Application_Model_Preference::getValue("library_datatable", true);
if ($data != "") {
$libraryTable = json_encode(unserialize($data));
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );");
@ -36,7 +36,7 @@ class ShowbuilderController extends Zend_Controller_Action
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', '' );");
}
$data = Application_Model_Preference::GetValue("timeline_datatable", true);
$data = Application_Model_Preference::getValue("timeline_datatable", true);
if ($data != "") {
$timelineTable = json_encode(unserialize($data));
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-timeline', JSON.stringify($timelineTable) );");
@ -130,7 +130,7 @@ class ShowbuilderController extends Zend_Controller_Action
$showLib = false;
if (!$user->isGuest()) {
$disableLib = false;
$data = Application_Model_Preference::GetValue("nowplaying_screen", true);
$data = Application_Model_Preference::getValue("nowplaying_screen", true);
if ($data != "") {
$settings = unserialize($data);

12
airtime_mvc/application/controllers/UsersettingsController.php
View file

@ -23,12 +23,12 @@ class UsersettingsController extends Zend_Controller_Action
$settings = $request->getParam("settings");
$data = serialize($settings);
Application_Model_Preference::SetValue("nowplaying_screen", $data, true);
Application_Model_Preference::setValue("nowplaying_screen", $data, true);
}
public function getNowPlayingScreenSettingsAction() {
$data = Application_Model_Preference::GetValue("nowplaying_screen", true);
$data = Application_Model_Preference::getValue("nowplaying_screen", true);
if ($data != "") {
$this->view->settings = unserialize($data);
}
@ -40,12 +40,12 @@ class UsersettingsController extends Zend_Controller_Action
$settings = $request->getParam("settings");
$data = serialize($settings);
Application_Model_Preference::SetValue("library_datatable", $data, true);
Application_Model_Preference::setValue("library_datatable", $data, true);
}
public function getLibraryDatatableAction() {
$data = Application_Model_Preference::GetValue("library_datatable", true);
$data = Application_Model_Preference::getValue("library_datatable", true);
if ($data != "") {
$this->view->settings = unserialize($data);
}
@ -59,7 +59,7 @@ class UsersettingsController extends Zend_Controller_Action
$settings = $request->getParam("settings");
$data = serialize($settings);
Application_Model_Preference::SetValue("timeline_datatable", $data, true);
Application_Model_Preference::setValue("timeline_datatable", $data, true);
$end = microtime(true);
@ -71,7 +71,7 @@ class UsersettingsController extends Zend_Controller_Action
$start = microtime(true);
$data = Application_Model_Preference::GetValue("timeline_datatable", true);
$data = Application_Model_Preference::getValue("timeline_datatable", true);
if ($data != "") {
$this->view->settings = unserialize($data);
}