Changeset 6052 for trunk/admin/include

Timestamp:

May 3, 2010, 2:49:26 PM (15 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)

File:

• trunk/admin/include/functions_upload.inc.php (modified) (2 diffs)

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'],