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

-cleanup parsing for form elements that weren't provided by the client in our SaaS implementation

Browse source
This commit is contained in:
Martin Konecny 2012-12-04 16:22:03 -05:00
parent fc09e8cd74
commit 3086bde17e
2 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,30 +70,20 @@ class PreferenceController extends Zend_Controller_Action
if ($request->isPost()) { if ($request->isPost()) {
$values = $request->getPost(); $values = $request->getPost();
if ($form->isValid($values)) { if ($form->isValid($values)) {
if ($values["Publicise"] != 1) { Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); Application_Model_Preference::SetPhone($values["Phone"]);
Application_Model_Preference::SetPublicise($values["Publicise"]); Application_Model_Preference::SetEmail($values["Email"]);
if (isset($values["Privacy"])) { Application_Model_Preference::SetStationWebSite($values["StationWebSite"]);
Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
}
} else {
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetPhone($values["Phone"]);
Application_Model_Preference::SetEmail($values["Email"]);
Application_Model_Preference::SetStationWebSite($values["StationWebSite"]);
Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]);
Application_Model_Preference::SetPublicise($values["Publicise"]);
$form->Logo->receive(); $form->Logo->receive();
$imagePath = $form->Logo->getFileName(); $imagePath = $form->Logo->getFileName();
Application_Model_Preference::SetStationCountry($values["Country"]); Application_Model_Preference::SetStationCountry($values["Country"]);
Application_Model_Preference::SetStationCity($values["City"]); Application_Model_Preference::SetStationCity($values["City"]);
Application_Model_Preference::SetStationDescription($values["Description"]); Application_Model_Preference::SetStationDescription($values["Description"]);
Application_Model_Preference::SetStationLogo($imagePath); Application_Model_Preference::SetStationLogo($imagePath);
if (isset($values["Privacy"])) { if (isset($values["Privacy"])) {
Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
}
} }
$this->view->statusMsg = "<div class='success'>Support setting updated.</div>"; $this->view->statusMsg = "<div class='success'>Support setting updated.</div>";
} }

17
airtime_mvc/application/forms/SupportSettings.php
View file

@ -126,20 +126,6 @@ class Application_Form_SupportSettings extends Zend_Form
} }
$this->addElement($checkboxPublicise); $this->addElement($checkboxPublicise);
// text area for sending detail
$this->addElement('textarea', 'SendInfo', array(
'class' => 'sending_textarea',
'required' => false,
'filters' => array('StringTrim'),
'readonly' => true,
'cols' => 61,
'rows' => 5,
'value' => Application_Model_Preference::GetSystemInfo(false, true),
'decorators' => array(
'ViewHelper'
)
));
// checkbox for privacy policy // checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.") $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.")
@ -159,9 +145,6 @@ class Application_Form_SupportSettings extends Zend_Form
public function isValid ($data) public function isValid ($data)
{ {
$isValid = parent::isValid($data); $isValid = parent::isValid($data);
if ($data['Publicise'] != 1) {
$isValid = true;
}
if (isset($data["Privacy"])) { if (isset($data["Privacy"])) {
$checkPrivacy = $this->getElement('Privacy'); $checkPrivacy = $this->getElement('Privacy');
if ($data["SupportFeedback"] == "1" && $data["Privacy"] != "1") { if ($data["SupportFeedback"] == "1" && $data["Privacy"] != "1") {