Changeset 6052

Timestamp:

May 3, 2010, 2:49:26 PM (14 years ago)

Author:

plg

Message:

bug 1639 fixed: the upload form now correctly uses the $confupload_dir
parameter (web API already use it).

By default, the $confupload_dir is no longer dependent to PHPWG_ROOT_PATH
because it becomes a real mess when admin/include/uploadify.php (called
directly, not from an include) tries to perform an upload.

Improvement: make clearer how $confupload_dir can be set (relative to the
Piwigo installation directory + HTTP reachable)

Location:

trunk

Files:

• admin/include/functions_upload.inc.php (modified) (2 diffs)
• admin/photos_add_direct.php (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)

trunk/admin/include/functions_upload.inc.php

@@ -32 +32 @@
   // upload directory hierarchy
   $upload_dir = sprintf(
-    PHPWG_ROOT_PATH.'upload/%s/%s/%s',
+    PHPWG_ROOT_PATH.$conf['upload_dir'].'/%s/%s/%s',
     $year,
     $month,
@@ -97 +97 @@
     'date_available' => $dbnow,
     'tn_ext' => 'jpg',
-    'path' => preg_replace('/^.*?upload/', './upload', $file_path),
+    'path' => preg_replace('#^'.preg_quote(PHPWG_ROOT_PATH).'#', '', $file_path),
     'filesize' => $file_infos['filesize'],
     'width' => $file_infos['width'],

trunk/admin/photos_add_direct.php

@@ -120 +120 @@
       if ('zip' == strtolower($extension))
       {
-        $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
+        $upload_dir = $conf['upload_dir'].'/buffer';
         prepare_directory($upload_dir);
         

trunk/include/config_default.inc.php

@@ -762 +762 @@
 $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data';
 
-// where should the API add photos?
-$conf['upload_dir'] = PHPWG_ROOT_PATH.'upload';
+// where should the API/UploadForm add photos? This path must be relative to
+// the Piwigo installation directory (but can be outside, as long as it's
+// reachable from your webserver).
+$conf['upload_dir'] = './upload';
 
 // where should the user be guided when there is no photo in his gallery yet?