Changeset 2102 for releases/2.1.2/modules/forge/libraries/Form_Upload.php

Timestamp:

02/21/2008 06:52:42 PM (11 months ago)

Author:

Shadowhand

Message:

Merged r2023 into releases/2.1.2

Files:

• releases/2.1.2/modules/forge/libraries/Form_Upload.php (modified) (4 diffs)

releases/2.1.2/modules/forge/libraries/Form_Upload.php

@@ -23 +23 @@
         protected $upload;
 
-        // Upload directory
+        // Upload directory and filename
         protected $directory;
+        protected $filename;
 
-        public function __construct($name)
+        public function __construct($name, $filename = FALSE)
         {
                 parent::__construct($name);
@@ -39 +40 @@
                                 // Hack to allow file-only inputs, where no POST data is present
                                 $_POST[$name] = $this->upload['name'];
+
+                                // Set the filename
+                                $this->filename = empty($filename) ? FALSE : $filename;
                         }
                         else
@@ -91 +95 @@
                         }
 
+                        if (file_exists($filepath = $this->directory.$filename))
+                        {
+                                if ($this->filename !== TRUE OR ! is_writable($filepath))
+                                {
+                                        // Prefix the file so that the filename is unique
+                                        $filepath = $this->directory.'uploadfile-'.uniqid(time()).'-'.$this->upload['name'];
+                                }
+                        }
+
                         // Move the uploaded file to the upload directory
-                        move_uploaded_file($this->upload['tmp_name'], $filename = $this->directory.$filename);
+                        move_uploaded_file($this->upload['tmp_name'], $filepath);
                 }
 
@@ -98 +111 @@
                 {
                         // Reset the POST value to the new filename
-                        $this->data['value'] = $_POST[$this->data['name']] = $filename;
+                        $this->data['value'] = $_POST[$this->data['name']] = $filepath;
                 }