All validation in Address file wouldn't have worked, fixed so now it …

…does
rickyrobinett · Sep 11, 2011 · ed8a745 · ed8a745
1 parent aa50305
commit ed8a745
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Ordrin/Address.php b/Ordrin/Address.php
@@ -27,11 +27,17 @@ function validate($element = "all") {
             // do ALL validation
             if (!preg_match('/(^\d{5}$)|(^\d{5}-\d{4}$)/', $this->zip)) {
                 parent::$_errors[] = 'Address - validation - zip code (invalid) (' . $this->zip . ')';
-            } elseif (!preg_match('/(^\(?(\d{3})\)?[- .]?(\d{3})[- .]?(\d{4})$)/', $this->phone) && $this->phone != "") {
+            }
+
+            if (!preg_match('/(^\(?(\d{3})\)?[- .]?(\d{3})[- .]?(\d{4})$)/', $this->phone) && $this->phone != "") {
                 parent::$_errors[] = 'Address - validation - phone number (invalid) (' . $this->phone . ')';
-            } elseif (!preg_match('/[A-z.-]/', $this->city)) {
+            }
+
+            if (!preg_match('/[A-z.-]/', $this->city)) {
                 parent::$_errors[] = 'Address - validation - city (invalid, only letters/spaces allowed) (' . $this->city . ')';
-            } elseif (!preg_match('/^([A-z]){2}$/', $this->state)  && $this->$state != "") {
+            }
+
+            if (!preg_match('/^([A-z]){2}$/', $this->state)  && $this->$state != "") {
                 parent::$_errors[] = 'Address - validation - state (invalid, only letters allowed and must be passed as two-letter abbreviation) (' . $this->state . ')';
             }
         }