Changeset 4783

Timestamp:

Jan 28, 2010, 10:01:16 PM (14 years ago)

Author:

plg

Message:

bug 1404 fixed: the original filename is not used directly as photo title
anymore. Instead we fill the images.file with the original filename and
then Piwigo displays a default title based on images.file content, but without
"_" or ".jpg" extension.

Location:

extensions/upload_form

Files:

• include/functions_upload.inc.php (modified) (3 diffs)
• upload.php (modified) (1 diff)

extensions/upload_form/include/functions_upload.inc.php

@@ -26 +26 @@
 $page['source_file'] = '/home/pierrick/public_html/test/resize/phpthumb/examples/statue_small.jpg';
 
-function add_uploaded_file($source_filepath, $name=null, $categories=null)
+function add_uploaded_file($source_filepath, $original_filename=null, $categories=null)
 {
   global $page;
@@ -81 +81 @@
   // database registration
   $insert = array(
-    'file' => basename($file_path),
+    'file' => isset($original_filename) ? $original_filename : basename($file_path),
     'date_available' => $dbnow,
     'tn_ext' => 'jpg',
@@ -91 +91 @@
     );
 
-  if (isset($name))
-  {
-    $insert['name'] = $name;
-  }
-
   if (isset($high_infos))
   {

extensions/upload_form/upload.php

@@ -51 +51 @@
     {
       $source_filepath = $_FILES['image_upload']['tmp_name'][$idx];
-      $name = $_FILES['image_upload']['name'][$idx];
-      add_uploaded_file($source_filepath, $name, array($_POST['category']));
+      $original_filename = $_FILES['image_upload']['name'][$idx];
+      add_uploaded_file($source_filepath, $original_filename, array($_POST['category']));
     }
   }