Changeset 409 for branches/1.1dev/lib

Timestamp:

Sep 17, 2012 9:39:42 PM (12 years ago)

Author:

anonymous

Message:

Begin updating FormValidator? to be array-aware.

File:

• branches/1.1dev/lib/FormValidator.inc.php (modified) (2 diffs)

branches/1.1dev/lib/FormValidator.inc.php

@@ -135 +135 @@
     {
     
-        $val = trim(getFormData($form_name));
-        if ($val != '') {
-            $this->addError($form_name, $msg);
-            return true;
-        } else {
-            return false;
+        $val = getFormData($form_name);
+        if (is_array($val)) {
+            if (!empty($val)) {
+                $this->addError($form_name, $msg);
+                return true;
+            } else {
+                return false;
+            }
+        } else {            
+            if (trim($val) != '') {
+                $this->addError($form_name, $msg);
+                return true;
+            } else {
+                return false;
+            }
         }
     }
@@ -154 +163 @@
     function isEmpty($form_name, $msg='')
     {
-    
-        $val = trim(getFormData($form_name));
-        if ($val == '') {
-            $this->addError($form_name, $msg);
-            return true;
-        } else {
-            return false;
+        $val = getFormData($form_name);
+        if (is_array($val)) {
+            if (empty($val)) {
+                $this->addError($form_name, $msg);
+                return true;
+            } else {
+                return false;
+            }
+        } else {            
+            if (trim($val) == '') {
+                $this->addError($form_name, $msg);
+                return true;
+            } else {
+                return false;
+            }
         }
     }