Changeset 4829 for extensions/upload_form

Timestamp:

Feb 2, 2010, 9:07:50 PM (14 years ago)

Author:

plg

Message:

feature 1408 added: upload a zip archive containing photos, needs more tests
(on windows operating system) but "yeah it already rocks" :-)

pclzip 2.8.2 included because the low memory usage features is missing from
pclzip 2.8.1 included in Piwigo core.

Location:

extensions/upload_form

Files:

• include/functions_upload.inc.php (modified) (1 diff)
• include/pclzip.lib.php (added)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• upload.php (modified) (2 diffs)
• upload.tpl (modified) (1 diff)

extensions/upload_form/include/functions_upload.inc.php

@@ -250 +250 @@
     );
 }
+
+function is_valid_image_extension($extension)
+{
+  return in_array(strtolower($extension), array('jpg', 'jpeg', 'png'));
+}
 ?>

extensions/upload_form/language/en_UK/plugin.lang.php

@@ -36 +36 @@
 $lang['Category "%s" now contains %d photos'] = 'Category "%s" now contains %d photos';
 $lang['Manage this set of %d photos'] = 'Manage this set of %d photos';
+$lang['Select files'] = 'Select files';
+$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
 ?>

extensions/upload_form/language/fr_FR/plugin.lang.php

@@ -36 +36 @@
 $lang['Category "%s" now contains %d photos'] = 'La catégorie "%s" contient désormais %d photos';
 $lang['Manage this set of %d photos'] = 'Gérer ce lot de %d photos';
+$lang['Select files'] = 'Choisir des fichiers';
+$lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP avec des fichiers JPEG dedans s\'il vous plaît.';
 ?>

extensions/upload_form/upload.php

@@ -120 +120 @@
     if (UPLOAD_ERR_OK == $error)
     {
-      $source_filepath = $_FILES['image_upload']['tmp_name'][$idx];
-      $original_filename = $_FILES['image_upload']['name'][$idx];
-      
-      $image_id = add_uploaded_file(
-        $source_filepath,
-        $original_filename,
-        array($category_id),
-        $_POST['level']
-        );
-
-      array_push($image_ids, $image_id);
-
-      // TODO: if $image_id is not an integer, something went wrong
-
-      // we could return the list of properties from the add_uploaded_file
-      // function, but I like the "double check". And it costs nothing
-      // compared to the upload process.
-      $thumbnail = array();
-      
-      $query = '
+      $images_to_add = array();
+      
+      $extension = pathinfo($_FILES['image_upload']['name'][$idx], PATHINFO_EXTENSION);
+      if ('zip' == strtolower($extension))
+      {
+        $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
+        prepare_directory($upload_dir);
+        
+        $temporary_archive_name = date('YmdHis').'-'.generate_key(10);
+        $archive_path = $upload_dir.'/'.$temporary_archive_name.'.zip';
+        
+        move_uploaded_file(
+          $_FILES['image_upload']['tmp_name'][$idx],
+          $archive_path
+          );
+
+        define('PCLZIP_TEMPORARY_DIR', $upload_dir.'/');
+        include(UPLOAD_FORM_PATH.'include/pclzip.lib.php');
+        $zip = new PclZip($archive_path);
+        if ($list = $zip->listContent())
+        {
+          $indexes_to_extract = array();
+          
+          foreach ($list as $node)
+          {
+            if (1 == $node['folder'])
+            {
+              continue;
+            }
+
+            if (is_valid_image_extension(pathinfo($node['filename'], PATHINFO_EXTENSION)))
+            {
+              array_push($indexes_to_extract, $node['index']);
+              
+              array_push(
+                $images_to_add,
+                array(
+                  'source_filepath' => $upload_dir.'/'.$temporary_archive_name.'/'.$node['filename'],
+                  'original_filename' => basename($node['filename']),
+                  )
+                );
+            }
+          }
+      
+          if (count($indexes_to_extract) > 0)
+          {
+            $zip->extract(
+              PCLZIP_OPT_PATH, $upload_dir.'/'.$temporary_archive_name,
+              PCLZIP_OPT_BY_INDEX, $indexes_to_extract,
+              PCLZIP_OPT_ADD_TEMP_FILE_ON
+              );
+          }
+        }
+      }
+      elseif (is_valid_image_extension($extension))
+      {
+        array_push(
+          $images_to_add,
+          array(
+            'source_filepath' => $_FILES['image_upload']['tmp_name'][$idx],
+            'original_filename' => $_FILES['image_upload']['name'][$idx],
+            )
+          );
+      }
+
+      foreach ($images_to_add as $image_to_add)
+      {
+        $image_id = add_uploaded_file(
+          $image_to_add['source_filepath'],
+          $image_to_add['original_filename'],
+          array($category_id),
+          $_POST['level']
+          );
+
+        array_push($image_ids, $image_id);
+
+        // TODO: if $image_id is not an integer, something went wrong
+
+        // we could return the list of properties from the add_uploaded_file
+        // function, but I like the "double check". And it costs nothing
+        // compared to the upload process.
+        $thumbnail = array();
+      
+        $query = '
 SELECT
     file,
@@ -147 +211 @@
   WHERE id = '.$image_id.'
 ;';
-      $image_infos = mysql_fetch_assoc(pwg_query($query));
-
-      $thumbnail['file'] = $image_infos['file'];
-      
-      $thumbnail['src'] = get_thumbnail_location(
-        array(
-          'path' => $image_infos['path'],
-          'tn_ext' => $image_infos['tn_ext'],
-          )
-        );
-
-      // TODO: when implementing this plugin in Piwigo core, we should have
-      // a function get_image_name($name, $file) (if name is null, then
-      // compute a temporary name from filename) that would be also used in
-      // picture.php. UPDATE: in fact, "get_name_from_file($file)" already
-      // exists and is used twice (element_set_unit + comments, but not in
-      // picture.php I don't know why) with the same pattern if
-      // (empty($name)) {$name = get_name_from_file($file)}, a clean
-      // function get_image_name($name, $file) would be better
-      $thumbnail['title'] = get_name_from_file($image_infos['file']);
-
-      $thumbnail['link'] = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'
-        .'&image_id='.$image_id
-        .'&cat_id='.$category_id
-        ;
-
-      array_push($page['thumbnails'], $thumbnail);
+        $image_infos = mysql_fetch_assoc(pwg_query($query));
+
+        $thumbnail['file'] = $image_infos['file'];
+      
+        $thumbnail['src'] = get_thumbnail_location(
+          array(
+            'path' => $image_infos['path'],
+            'tn_ext' => $image_infos['tn_ext'],
+            )
+          );
+
+        // TODO: when implementing this plugin in Piwigo core, we should have
+        // a function get_image_name($name, $file) (if name is null, then
+        // compute a temporary name from filename) that would be also used in
+        // picture.php. UPDATE: in fact, "get_name_from_file($file)" already
+        // exists and is used twice (element_set_unit + comments, but not in
+        // picture.php I don't know why) with the same pattern if
+        // (empty($name)) {$name = get_name_from_file($file)}, a clean
+        // function get_image_name($name, $file) would be better
+        $thumbnail['title'] = get_name_from_file($image_infos['file']);
+
+        $thumbnail['link'] = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'
+          .'&image_id='.$image_id
+          .'&cat_id='.$category_id
+          ;
+
+        array_push($page['thumbnails'], $thumbnail);
+      }
     }
   }

extensions/upload_form/upload.tpl

@@ -110 +110 @@
       <tr>
         <td colspan="2">
+          <strong>{'Select files'|@translate}</strong>
+          <p>{'JPEG files or ZIP archives with JPEG files inside please.'|@translate}</p>
           <div id="uploadBoxes">
             <p><input class="file" type="file" size="70" name="image_upload[]" /></p>