pluf2 Commit Details

Date:

2008-11-27 04:12:57 (16 years 25 days ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

4a4fe11a64c80380998fb8f81ac9ab6117cb211c

Parents:

9eed1bd5e4314d77ccef3834c1c3f34ff4e89fce

Message:

Improved the upload of files in case of no files.

Changes:

File differences

-37
38 38
39 39
40
41
42
43
44
40 45
41 46
42 47
+    function clean($value)␊
    {␊
        parent::clean($value);␊
        if (is_null($value) and !$this->required) {␊
            return ''; // no file␊
        } elseif (is_null($value) and $this->required) {␊
            throw new Pluf_Form_Invalid(__('No files were uploaded. Please try to send the file again.'));␊
        }␊
        $errors = array();␊
        $no_files = false;␊
        switch ($value['error']) {␊
     function clean($value)␊
     {␊
         parent::clean($value);␊
+        if (is_null($value) and !$this->required) {␊
+            return ''; // no file␊
+        } elseif (is_null($value) and $this->required) {␊
+            throw new Pluf_Form_Invalid(__('No files were uploaded. Please try to send the file again.'));␊
+        }␊
         $errors = array();␊
         $no_files = false;␊
         switch ($value['error']) {␊

-79
80 80
81 81
82 
83 82
84 83
85 84
+     */␊
    static function cleanFileName($name)␊
    {␊
        $name = mb_strtolower($name, 'UTF-8');␊
        return mb_ereg_replace("/\015\012|\015|\012|\s|[^A-Za-z0-9\.\-\_]/", '_', $name);␊
    }␊
␊
      */␊
     static function cleanFileName($name)␊
     {␊
-        $name = mb_strtolower($name, 'UTF-8');␊
         return mb_ereg_replace("/\015\012|\015|\012|\s|[^A-Za-z0-9\.\-\_]/", '_', $name);␊
     }␊
 ␊