From fd3305bc4cbebdc17f9aefb14efa8be7d27c7ec1 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 6 Nov 2012 17:10:47 -0500 Subject: [PATCH] SAAS-289: Remove all isSaaS checks -done --- .../controllers/PreferenceController.php | 16 ++-------- .../controllers/ScheduleController.php | 4 --- .../forms/EmailServerPreferences.php | 5 +-- .../application/forms/GeneralPreferences.php | 5 +-- .../forms/LiveStreamingPreferences.php | 9 +----- airtime_mvc/application/forms/Preferences.php | 7 +---- .../application/forms/SupportSettings.php | 9 +----- airtime_mvc/application/models/Schedule.php | 31 ------------------- .../application/views/helpers/IsSaas.php | 12 ------- .../views/scripts/form/preferences.phtml | 10 +++--- .../form/preferences_email_server.phtml | 2 -- .../scripts/form/preferences_livestream.phtml | 8 ++--- .../views/scripts/form/support-setting.phtml | 6 +--- .../application/views/scripts/menu.phtml | 11 +------ .../scripts/schedule/add-show-form.phtml | 2 -- 15 files changed, 15 insertions(+), 122 deletions(-) delete mode 100644 airtime_mvc/application/views/helpers/IsSaas.php diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 5c375deab..2d4764561 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -22,8 +22,6 @@ class PreferenceController extends Zend_Controller_Action { global $CC_CONFIG; - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -42,7 +40,6 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]); Application_Model_Preference::SetWeekStartDay($values["preferences_general"]["weekStartDay"]); - if (!$isSaas) { Application_Model_Preference::SetEnableSystemEmail($values["preferences_email_server"]["enableSystemEmail"]); Application_Model_Preference::SetSystemEmail($values["preferences_email_server"]["systemEmail"]); Application_Model_Preference::SetMailServerConfigured($values["preferences_email_server"]["configureMailServer"]); @@ -51,7 +48,6 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetMailServerPassword($values["preferences_email_server"]["ms_password"]); Application_Model_Preference::SetMailServerPort($values["preferences_email_server"]["port"]); Application_Model_Preference::SetMailServerRequiresAuth($values["preferences_email_server"]["msRequiresAuth"]); - } Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]); Application_Model_Preference::SetUploadToSoundcloudOption($values["preferences_soundcloud"]["UploadToSoundcloudOption"]); @@ -79,13 +75,12 @@ class PreferenceController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/support-setting.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->statusMsg = ""; - $isSass = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; $form = new Application_Form_SupportSettings(); if ($request->isPost()) { $values = $request->getPost(); if ($form->isValid($values)) { - if (!$isSass && $values["Publicise"] != 1) { + if ($values["Publicise"] != 1) { Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); Application_Model_Preference::SetPublicise($values["Publicise"]); if (isset($values["Privacy"])) { @@ -96,10 +91,8 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetPhone($values["Phone"]); Application_Model_Preference::SetEmail($values["Email"]); Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); - if (!$isSass) { Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); Application_Model_Preference::SetPublicise($values["Publicise"]); - } $form->Logo->receive(); $imagePath = $form->Logo->getFileName(); @@ -108,7 +101,7 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetStationCity($values["City"]); Application_Model_Preference::SetStationDescription($values["Description"]); Application_Model_Preference::SetStationLogo($imagePath); - if (!$isSass && isset($values["Privacy"])) { + if (isset($values["Privacy"])) { Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); } } @@ -155,7 +148,6 @@ class PreferenceController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; // get current settings $temp = Application_Model_StreamSetting::getStreamSetting(); @@ -208,10 +200,8 @@ class PreferenceController extends Zend_Controller_Action $error = false; if ($form->isValid($values)) { - if (!$isSaas) { $values['output_sound_device'] = $form->getValue('output_sound_device'); $values['output_sound_device_type'] = $form->getValue('output_sound_device_type'); - } $values['icecast_vorbis_metadata'] = $form->getValue('icecast_vorbis_metadata'); $values['streamFormat'] = $form->getValue('streamFormat'); @@ -226,7 +216,6 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetAutoTransition($values["auto_transition"]); Application_Model_Preference::SetAutoSwitch($values["auto_switch"]); - if (!$isSaas) { if (!Application_Model_Preference::GetMasterDjConnectionUrlOverride()) { $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_harbor_input_port"]."/".$values["master_harbor_input_mount_point"]; if (empty($values["master_harbor_input_port"]) || empty($values["master_harbor_input_mount_point"])) { @@ -254,7 +243,6 @@ class PreferenceController extends Zend_Controller_Action 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 Application_Model_Preference::SetStreamUpdateTimestamp(); diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index a8b5b557c..9515aa4fc 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -526,8 +526,6 @@ class ScheduleController extends Zend_Controller_Action $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $user = new Application_Model_User($userInfo->id); - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $showInstanceId = $this->_getParam('id'); $this->view->action = "edit-show"; @@ -632,7 +630,6 @@ class ScheduleController extends Zend_Controller_Action $formLive->populate($show->getLiveStreamInfo()); - if (!$isSaas) { $formRecord = new Application_Form_AddShowRR(); $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates(); @@ -676,7 +673,6 @@ class ScheduleController extends Zend_Controller_Action $formAbsoluteRebroadcast->disable(); $formRebroadcast->disable(); } - } if (!$isAdminOrPM) { $formWhat->disable(); diff --git a/airtime_mvc/application/forms/EmailServerPreferences.php b/airtime_mvc/application/forms/EmailServerPreferences.php index 601cfb319..03c73dae9 100644 --- a/airtime_mvc/application/forms/EmailServerPreferences.php +++ b/airtime_mvc/application/forms/EmailServerPreferences.php @@ -4,15 +4,12 @@ require_once 'customvalidators/PasswordNotEmpty.php'; class Application_Form_EmailServerPreferences extends Zend_Form_SubForm { - private $isSaas; public function init() { - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $this->isSaas = $isSaas; $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_email_server.phtml', "isSaas" => $isSaas)) + array('ViewScript', array('viewScript' => 'form/preferences_email_server.phtml')) )); // Enable system emails diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index 76144df05..815d46779 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -2,15 +2,12 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm { - private $isSaas; public function init() { - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $this->isSaas = $isSaas; $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_general.phtml', "isSaas" => $isSaas)) + array('ViewScript', array('viewScript' => 'form/preferences_general.phtml')) )); $defaultFade = Application_Model_Preference::GetDefaultFade(); diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index e66976c8b..c5b9d9aca 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -9,7 +9,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1; $isStreamConfigable = Application_Model_Preference::GetEnableStreamConf() == "true"; - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; $defaultFade = Application_Model_Preference::GetDefaultTransitionFade(); if ($defaultFade == "") { $defaultFade = '00.000000'; @@ -82,7 +81,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $this->addElement($live_dj_connection_url); //liquidsoap harbor.input port - if (!$isSaas) { $m_port = Application_Model_StreamSetting::getMasterLiveStreamPort(); $master_dj_port = new Zend_Form_Element_Text('master_harbor_input_port'); $master_dj_port->setLabel("Master Source Port") @@ -119,7 +117,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered')))) ->setDecorators(array('ViewHelper')); $this->addElement($live_dj_mount); - } // demo only code if (!$isStreamConfigable) { $elements = $this->getElements(); @@ -135,21 +132,18 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm { global $CC_CONFIG; - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1; $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL(); $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL(); $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isSaas' => $isSaas, 'isDemo' => $isDemo)) + array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isDemo' => $isDemo)) )); } public function isValid($data) { - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; $isValid = parent::isValid($data); - if (!$isSaas) { $master_harbor_input_port = $data['master_harbor_input_port']; $dj_harbor_input_port = $data['dj_harbor_input_port']; @@ -189,7 +183,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $isValid = false; } } - } return $isValid; } diff --git a/airtime_mvc/application/forms/Preferences.php b/airtime_mvc/application/forms/Preferences.php index 878abe7f9..728ce7b29 100644 --- a/airtime_mvc/application/forms/Preferences.php +++ b/airtime_mvc/application/forms/Preferences.php @@ -2,27 +2,22 @@ class Application_Form_Preferences extends Zend_Form { - private $isSaas; public function init() { $this->setAction('/Preference'); $this->setMethod('post'); - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $this->isSaas = $isSaas; $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences.phtml', "isSaas" => $this->isSaas)) + array('ViewScript', array('viewScript' => 'form/preferences.phtml')) )); $general_pref = new Application_Form_GeneralPreferences(); $this->addSubForm($general_pref, 'preferences_general'); - if (!$isSaas) { $email_pref = new Application_Form_EmailServerPreferences(); $this->addSubForm($email_pref, 'preferences_email_server'); - } $soundcloud_pref = new Application_Form_SoundcloudPreferences(); $this->addSubForm($soundcloud_pref, 'preferences_soundcloud'); diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index cbd942970..99aae55ad 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -4,16 +4,13 @@ require_once 'customfilters/ImageSize.php'; class Application_Form_SupportSettings extends Zend_Form { - private $isSass; public function init() { $country_list = Application_Model_Preference::GetCountryList(); - $isSass = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $this->isSass = $isSass; $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/support-setting.phtml', "isSaas" => $isSass)), + array('ViewScript', array('viewScript' => 'form/support-setting.phtml')), array('File', array('viewScript' => 'form/support-setting.phtml', 'placement' => false))) ); @@ -109,7 +106,6 @@ class Application_Form_SupportSettings extends Zend_Form $upload->setAttrib('accept', 'image/*'); $this->addElement($upload); - if (!$isSass) { //enable support feedback $this->addElement('checkbox', 'SupportFeedback', array( 'label' => 'Send support feedback', @@ -150,7 +146,6 @@ class Application_Form_SupportSettings extends Zend_Form $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's privacy policy.") ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); - } // submit button $submit = new Zend_Form_Element_Submit("submit"); @@ -165,7 +160,6 @@ class Application_Form_SupportSettings extends Zend_Form public function isValid ($data) { $isValid = parent::isValid($data); - if (!$this->isSass) { if ($data['Publicise'] != 1) { $isValid = true; } @@ -176,7 +170,6 @@ class Application_Form_SupportSettings extends Zend_Form $isValid = false; } } - } return $isValid; } diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 3a03a4369..2c0441163 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -883,8 +883,6 @@ SQL; public static function createNewFormSections($p_view) { - $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - $formWhat = new Application_Form_AddShowWhat(); $formWho = new Application_Form_AddShowWho(); $formWhen = new Application_Form_AddShowWhen(); @@ -916,7 +914,6 @@ SQL; $formRepeats->populate(array('add_show_end_date' => date("Y-m-d"))); - if (!$isSaas) { $formRecord = new Application_Form_AddShowRR(); $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates(); @@ -928,7 +925,6 @@ SQL; $p_view->rr = $formRecord; $p_view->absoluteRebroadcast = $formAbsoluteRebroadcast; $p_view->rebroadcast = $formRebroadcast; - } $p_view->addNewShow = true; } @@ -939,8 +935,6 @@ SQL; * 2.1 deadline looming, this is OK for now. -Martin */ public static function updateShowInstance($data, $controller) { - $isSaas = (Application_Model_Preference::GetPlanLevel() != 'disabled'); - $formWhat = new Application_Form_AddShowWhat(); $formWhen = new Application_Form_AddShowWhen(); $formRepeats = new Application_Form_AddShowRepeats(); @@ -955,7 +949,6 @@ SQL; $formStyle->removeDecorator('DtDdWrapper'); $formLive->removeDecorator('DtDdWrapper'); - if (!$isSaas) { $formRecord = new Application_Form_AddShowRR(); $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates(); @@ -963,7 +956,6 @@ SQL; $formRecord->removeDecorator('DtDdWrapper'); $formAbsoluteRebroadcast->removeDecorator('DtDdWrapper'); $formRebroadcast->removeDecorator('DtDdWrapper'); - } $when = $formWhen->isValid($data); if ($when && $formWhen->checkReliantFields($data, true, null, true)) { @@ -997,7 +989,6 @@ SQL; $controller->view->who = $formWho; $controller->view->style = $formStyle; $controller->view->live = $formLive; - if (!$isSaas) { $controller->view->rr = $formRecord; $controller->view->absoluteRebroadcast = $formAbsoluteRebroadcast; $controller->view->rebroadcast = $formRebroadcast; @@ -1005,7 +996,6 @@ SQL; //$formRecord->disable(); //$formAbsoluteRebroadcast->disable(); //$formRebroadcast->disable(); - } return false; } @@ -1026,7 +1016,6 @@ SQL; $user = new Application_Model_User($userInfo->id); $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); - $isSaas = (Application_Model_Preference::GetPlanLevel() != 'disabled'); $record = false; $formWhat = new Application_Form_AddShowWhat(); @@ -1072,7 +1061,6 @@ SQL; $data["add_show_duration"] = $hValue.":".$mValue; - if (!$isSaas) { $formRecord = new Application_Form_AddShowRR(); $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates(); @@ -1083,14 +1071,12 @@ SQL; $record = $formRecord->isValid($data); - } if ($data["add_show_repeats"]) { $repeats = $formRepeats->isValid($data); if ($repeats) { $repeats = $formRepeats->checkReliantFields($data); } - if (!$isSaas) { $formAbsoluteRebroadcast->reset(); //make it valid, results don't matter anyways. $rebroadAb = 1; @@ -1103,10 +1089,8 @@ SQL; } else { $rebroad = 1; } - } } else { $repeats = 1; - if (!$isSaas) { $formRebroadcast->reset(); //make it valid, results don't matter anyways. $rebroad = 1; @@ -1119,13 +1103,11 @@ SQL; } else { $rebroadAb = 1; } - } } $who = $formWho->isValid($data); $style = $formStyle->isValid($data); if ($what && $when && $repeats && $who && $style && $live) { - if (!$isSaas) { if ($record && $rebroadAb && $rebroad) { if ($isAdminOrPM) { Application_Model_Show::create($data); @@ -1152,17 +1134,6 @@ SQL; return false; } - } else { - if ($isAdminOrPM) { - Application_Model_Show::create($data); - } - - //send back a new form for the user. - Application_Model_Schedule::createNewFormSections($controller->view); - - //$controller->view->newForm = $controller->view->render('schedule/add-show-form.phtml'); - return true; - } } else { $controller->view->what = $formWhat; $controller->view->when = $formWhen; @@ -1171,11 +1142,9 @@ SQL; $controller->view->style = $formStyle; $controller->view->live = $formLive; - if (!$isSaas) { $controller->view->rr = $formRecord; $controller->view->absoluteRebroadcast = $formAbsoluteRebroadcast; $controller->view->rebroadcast = $formRebroadcast; - } //$controller->view->addNewShow = !$editShow; //$controller->view->form = $controller->view->render('schedule/add-show-form.phtml'); return false; diff --git a/airtime_mvc/application/views/helpers/IsSaas.php b/airtime_mvc/application/views/helpers/IsSaas.php deleted file mode 100644 index 0e8bc0cee..000000000 --- a/airtime_mvc/application/views/helpers/IsSaas.php +++ /dev/null @@ -1,12 +0,0 @@ -element->getSubform('preferences_general') ?> - isSaas) { ?> -

Email / Mail Server Settings

-
- element->getSubform('preferences_email_server') ?> -
- +

Email / Mail Server Settings

+
+ element->getSubform('preferences_email_server') ?> +

SoundCloud Settings

diff --git a/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml b/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml index 9aba8a052..c47b926af 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml @@ -1,7 +1,6 @@
- isSaas ){?>
-
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml index e2dd5d7dc..62339e137 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml @@ -76,7 +76,6 @@ - isSaas ){?>
@@ -105,14 +104,13 @@ -
element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?> - isSaas && !$this->isDemo){?> + isDemo){?> Override  
@@ -121,7 +119,6 @@ OK RESET
- isSaas ){?>
@@ -150,14 +147,13 @@ -
element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?> - isSaas && !$this->isDemo ){?> + isDemo ){?> Override  
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml index f35a6eab1..ad15671f6 100644 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -1,5 +1,4 @@
-isSaas ){?>
@@ -38,8 +37,7 @@
(In order to promote your station, "Send support feedback" must be enabled).

- -
;"> +
;">
-isSaas ){?>
Show me what I am sending @@ -182,5 +179,4 @@ Sourcefabric Privacy Policy
- diff --git a/airtime_mvc/application/views/scripts/menu.phtml b/airtime_mvc/application/views/scripts/menu.phtml index 0e6eb8dc1..f6f82c173 100644 --- a/airtime_mvc/application/views/scripts/menu.phtml +++ b/airtime_mvc/application/views/scripts/menu.phtml @@ -1,9 +1,3 @@ -