Changeset 5013 for branches/2.0/include

Timestamp:

Mar 1, 2010, 5:20:24 PM (15 years ago)

Author:

plg

Message:

feature 1448 added: ability to set the upload directory (for pwg.images.add
API method).

Warning: due to risk on img src construction, the upload_dir must be relative
to the Piwigo directory itself.

Location:

branches/2.0/include

Files:

• config_default.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (5 diffs)

branches/2.0/include/config_default.inc.php

@@ -742 +742 @@
 // or other plugin variables etc
 $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data';
+
+// where should the API add photos?
+$conf['upload_dir'] = PHPWG_ROOT_PATH.'upload';
 ?>

branches/2.0/include/ws_functions.inc.php

@@ -912 +912 @@
 function ws_images_add_chunk($params, &$service)
 {
+  global $conf;
+  
   ws_logfile('[ws_images_add_chunk] welcome');
   // data
@@ -942 +944 @@
   }
 
-  $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
+  $upload_dir = $conf['upload_dir'].'/buffer';
 
   // create the upload directory tree if not exists
@@ -991 +993 @@
 function merge_chunks($output_filepath, $original_sum, $type)
 {
+  global $conf;
+  
   ws_logfile('[merge_chunks] input parameter $output_filepath : '.$output_filepath);
 
@@ -1004 +1008 @@
   }
 
-  $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
+  $upload_dir = $conf['upload_dir'].'/buffer';
   $pattern = '/'.$original_sum.'-'.$type.'/';
   $chunks = array();
@@ -1231 +1235 @@
   // upload directory hierarchy
   $upload_dir = sprintf(
-    PHPWG_ROOT_PATH.'upload/%s/%s/%s',
+    $conf['upload_dir'].'/%s/%s/%s',
     $year,
     $month,