Attachment upload server and path now configurable

2 files changed, 77 insertions, 15 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 72ccd8c32..09652d2b3 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -257,23 +257,43 @@ class NewnoticeAction extends Action
     }
 
     function storeFile($notice, $mimetype) {
-        $filename = basename($_FILES['attach']['name']);
-        $destination = "file/{$notice->id}-$filename";
-        if (move_uploaded_file($_FILES['attach']['tmp_name'], INSTALLDIR . "/$destination")) {
+
+        common_debug("NewnoticeAction::storeFile()");
+
+        $basename = basename($_FILES['attach']['name']);
+
+        common_debug("Basename: $basename");
+
+        $filename = File::filename($notice->id, $basename);
+
+        common_debug("filename: $filename");
+
+        $filepath = File::path($filename);
+
+        common_debug("filepath: $filepath");
+
+        if (move_uploaded_file($_FILES['attach']['tmp_name'], $filepath)) {
+
             $file = new File;
+            $file->filename = $filename;
+
             $file->url = common_local_url('file', array('notice' => $notice->id));
-            $file->size = filesize(INSTALLDIR . "/$destination");
+
+            common_debug("file->url =". $file->url);
+
+            $file->size = filesize($filepath);
             $file->date = time();
             $file->mimetype = $mimetype;
+
             if ($file_id = $file->insert()) {
                 $file_redir = new File_redirection;
-                $file_redir->url = common_path($destination);
+                $file_redir->url = File::url($filename);
                 $file_redir->file_id = $file_id;
                 $file_redir->insert();
 
                 $f2p = new File_to_post;
-                $f2p->file_id = $file_id; 
-                $f2p->post_id = $notice->id; 
+                $f2p->file_id = $file_id;
+                $f2p->post_id = $notice->id;
                 $f2p->insert();
             } else {
                 $this->clientError(_('There was a database error while saving your file. Please try again.'));
diff --git a/classes/File.php b/classes/File.php
index 47af1c550..1de136240 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -30,7 +30,7 @@ require_once INSTALLDIR.'/classes/File_to_post.php';
  * Table Definition for file
  */
 
-class File extends Memcached_DataObject 
+class File extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -38,12 +38,12 @@ class File extends Memcached_DataObject
     public $__table = 'file';                            // table name
     public $id;                              // int(4)  primary_key not_null
     public $url;                             // varchar(255)  unique_key
-    public $mimetype;                        // varchar(50)  
-    public $size;                            // int(4)  
-    public $title;                           // varchar(255)  
-    public $date;                            // int(4)  
-    public $protected;                       // int(4)  
-    public $filename;                        // varchar(255)  
+    public $mimetype;                        // varchar(50)
+    public $size;                            // int(4)
+    public $title;                           // varchar(255)
+    public $date;                            // int(4)
+    public $protected;                       // int(4)
+    public $filename;                        // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
@@ -116,7 +116,7 @@ class File extends Memcached_DataObject
             $x = File::staticGet($file_id);
             if (empty($x)) die('Impossible!');
         }
-       
+
         File_to_post::processNew($file_id, $notice_id);
         return $x;
     }
@@ -145,5 +145,47 @@ class File extends Memcached_DataObject
         }
         return true;
     }
+
+    // where should the file go?
+
+     static function filename($notice_id, $basename)
+     {
+         return $notice_id . '-' . $basename;
+     }
+
+     static function path($filename)
+     {
+         $dir = common_config('attachments', 'dir');
+
+         if ($dir[strlen($dir)-1] != '/') {
+             $dir .= '/';
+         }
+
+         return $dir . $filename;
+     }
+
+     static function url($filename)
+     {
+         $path = common_config('attachments', 'path');
+
+         if ($path[strlen($path)-1] != '/') {
+             $path .= '/';
+         }
+
+         if ($path[0] != '/') {
+             $path = '/'.$path;
+         }
+
+         $server = common_config('attachments', 'server');
+
+         if (empty($server)) {
+             $server = common_config('site', 'server');
+         }
+
+         // XXX: protocol
+
+         return 'http://'.$server.$path.$filename;
+     }
+
 }