Changeset 222

Timestamp:

Dec 22, 2006 11:00:07 PM (17 years ago)

Author:

quinn

Message:

Q - added fileuploaded() to FormValidator?.

Location:

tags/2.0.2/lib

Files:

• FormValidator.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (1 diff)

tags/2.0.2/lib/FormValidator.inc.php

@@ -598 +598 @@
 
     /**
+     * Check whether a file was selected for uploading. If file is missing, it's an error.
+     *
+     * @param  string $form_name the name of the incoming form variable
+     * @param  string $msg       the message to display on error
+     *
+     * @return bool   true if no errors found, false otherwise
+     */
+    function fileUploaded($form_name, $msg='')
+    {
+        if (!isset($_FILES[$form_name]['name']) || empty($_FILES[$form_name]['name'])) {
+            $this->addError($form_name, $msg);
+            return false;
+        }
+        
+        if (is_array($_FILES[$form_name]['name'])) {
+            foreach($_FILES[$form_name]['name'] as $f) {
+                if ('' == $f) {
+                    $this->addError($form_name, $msg);
+                    return false;
+                }
+            }
+        } else {
+            if ('' == $_FILES[$form_name]['name']) {
+                $this->addError($form_name, $msg);
+                return false;
+            }
+        }
+        
+        return true;
+    }
+
+    /**
      * Check whether uploaded file is valid.
      *
@@ -605 +637 @@
      * @return bool   true if no errors found, false otherwise
      */
-    function validateFile($form_name, $msg='')
-    {
-        if (isset($_FILES[$form_name]['tmp_name']) && '' == trim($_FILES[$form_name]['tmp_name'])) {
-            $this->addError($form_name, $msg);
-            return false;
-        } else {
-            return true;
-        }
-    }
+    // function validateFile($form_name, $msg='')
+    // {
+    //     if (isset($_FILES[$form_name]['tmp_name']) && '' == trim($_FILES[$form_name]['tmp_name'])) {
+    //         $this->addError($form_name, $msg);
+    //         return false;
+    //     } else {
+    //         return true;
+    //     }
+    // }
 
 } // THE END

tags/2.0.2/lib/Utilities.inc.php

@@ -472 +472 @@
  * @return string         Comma list of array values.
  */
-function escapedList($in)
+function escapedList($in, $separator="', 's")
 {
     if (is_array($in) && !empty($in)) {
-        return "'" . join("', '", array_map(array('DB', 'escapeString'), $in)) . "'";
+        return join($separator, array_map(array('DB', 'escapeString'), $in));
     } else {
         return DB::escapeString($in);