Changeset 4487

Timestamp:

01/20/12 14:25:41 (4 months ago)

Author:

tboutell

Message:

The getFileName() method, to be useful, should return a full path to where the file was actually stored after making the name safe and so forth. This is a change, I'll talk to Wes

Files:

• plugins/apostropheHTML5Plugin/trunk/lib/uploader/qqFileUploader.class.php (modified) (4 diffs)

plugins/apostropheHTML5Plugin/trunk/lib/uploader/qqFileUploader.class.php

@@ -69 +69 @@
     private $sizeLimit = 10485760;
     private $file;
+    private $acceptedFilename;
 
     function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){        
@@ -150 +151 @@
         }
         
-        if ($this->file->save($uploadDirectory . $filename . '.' . $ext)){
+        $acceptedFilename = $uploadDirectory . $filename . '.' . $ext;
+        if ($this->file->save($acceptedFilename)) {
+            error_log("accepted");
+            $this->acceptedFilename = $acceptedFilename;
             return array('success' => true);
         } else {
@@ -156 +160 @@
                 'The upload was cancelled, or server error encountered');
         }
-        
     }
 
     /**
-     * Returns name of handled file.
+     * Returns full path to handled file.
      *
-     * False if no file exists.
+     * False if no file has been successfully handled.
      *
      *
@@ -169 +172 @@
     public function getFileName()
     {
-      if (!$this->file)
+      error_log("Getting filename");
+      if (!isset($this->acceptedFilename))
       {
         return false;
       }
+      error_log("Returning {$this->acceptedFilename}");
 
-      return $this->file->getName();
+      return $this->acceptedFilename;
     }
 }