bug 1639 fixed: the upload form now correctly uses the $conf['upload_dir']

parameter (web API already use it).

By default, the $conf['upload_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 $conf['upload_dir'] can be set (relative to the
Piwigo installation directory + HTTP reachable)

git-svn-id: http://piwigo.org/svn/trunk@6052 68402e56-0260-453c-a942-63ccdbb3a9ee

admin/include/functions_upload.inc.php

@@ -31,7 +31,7 @@ function add_uploaded_file($source_filepath, $original_filename=null, $categorie
   
   // upload directory hierarchy
   $upload_dir = sprintf(
-    PHPWG_ROOT_PATH.'upload/%s/%s/%s',
+    PHPWG_ROOT_PATH.$conf['upload_dir'].'/%s/%s/%s',
     $year,
     $month,
     $day
@@ -96,7 +96,7 @@ function add_uploaded_file($source_filepath, $original_filename=null, $categorie
     'file' => isset($original_filename) ? $original_filename : basename($file_path),
     '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'],
     'height' => $file_infos['height'],