From 4c4b57fd310129363584e2c62f069c6c3400d2b7 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 23 Aug 2011 16:09:11 -0400
Subject: [PATCH] CC-2718: Changes to the support page

- overriding isValid in RegisterAirtimeForm
---
 .../application/forms/RegisterAirtime.php       | 17 +++++++++++++++++
 .../application/forms/SupportSettings.php       |  8 ++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 011a1b0e7..694224b9d 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -148,5 +148,22 @@ class Application_Form_RegisterAirtime extends Zend_Form
             ->setDecorators(array('ViewHelper'));
         $this->addElement($checkboxPrivacy);
     }
+    
+    // overriding isValid function
+    public function isValid ($data)
+    {
+        $isValid = parent::isValid($data);
+        if($data['Publicise'] != 1){
+            $isValid = true;
+        }
+        if(isset($data["Privacy"])){
+            $checkPrivacy = $this->getElement('Privacy');
+            if($data["SupportFeedback"] == "1" && $data["Privacy"] != "1"){
+                $checkPrivacy->addError("You have to agree to privacy policy.");
+                $isValid = false;
+            }
+        }
+        return $isValid;
+    }
 }
 
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index 36c5e8c84..2e0d238a3 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -157,12 +157,12 @@ class Application_Form_SupportSettings extends Zend_Form
         $this->addElement($submit);
     }
     
-    // overwriting isValid function
+    // overriding isValid function
     public function isValid ($data)
     {
-        $isValid = true;
-        if($data['Publicise'] == 1){
-            $isValid = parent::isValid($data);
+        $isValid = parent::isValid($data);
+        if($data['Publicise'] != 1){
+            $isValid = true;
         }
         if(isset($data["Privacy"])){
             $checkPrivacy = $this->getElement('Privacy');