feature 1489: integrate UploadForm into Piwigo core. The integration is not

100% done, I just "made it work" on trunk.

pclzip library was updated to version 2.8.2 for memory usage improvement.

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

1 files changed, 488 insertions, 0 deletions

diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php
new file mode 100644
index 000000000..4fceb6b12
--- /dev/null
+++ b/admin/photos_add_direct.php
@@ -0,0 +1,488 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2010      Pierrick LE GALL             http://piwigo.org |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHOTOS_ADD_BASE_URL'))
+{
+  die ("Hacking attempt!");
+}
+
+// +-----------------------------------------------------------------------+
+// |                        batch management request                       |
+// +-----------------------------------------------------------------------+
+
+if (isset($_GET['batch']))
+{
+  check_input_parameter('batch', $_GET['batch'], false, '/^\d+(,\d+)*$/');
+
+  $query = '
+DELETE FROM '.CADDIE_TABLE.'
+  WHERE user_id = '.$user['id'].'
+;';
+  pwg_query($query);
+
+  $inserts = array();
+  foreach (explode(',', $_GET['batch']) as $image_id)
+  {
+    array_push(
+      $inserts,
+      array(
+        'user_id' => $user['id'],
+        'element_id' => $image_id,
+        )
+      );
+  }
+  mass_inserts(
+    CADDIE_TABLE,
+    array_keys($inserts[0]),
+    $inserts
+    );
+
+  redirect(get_root_url().'admin.php?page=element_set&cat=caddie');
+}
+
+// +-----------------------------------------------------------------------+
+// |                             process form                              |
+// +-----------------------------------------------------------------------+
+
+if (isset($_POST['submit_upload']))
+{
+//   echo '<pre>POST'."\n"; print_r($_POST); echo '</pre>';
+//   echo '<pre>FILES'."\n"; print_r($_FILES); echo '</pre>';
+//   echo '<pre>SESSION'."\n"; print_r($_SESSION); echo '</pre>';
+//   exit();
+  
+  $category_id = null;
+  if ('existing' == $_POST['category_type'])
+  {
+    $category_id = $_POST['category'];
+  }
+  elseif ('new' == $_POST['category_type'])
+  {
+    $output_create = create_virtual_category(
+      $_POST['category_name'],
+      (0 == $_POST['category_parent'] ? null : $_POST['category_parent'])
+      );
+    
+    $category_id = $output_create['id'];
+
+    if (isset($output_create['error']))
+    {
+      array_push($page['errors'], $output_create['error']);
+    }
+    else
+    {
+      $category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=cat_modify&amp;cat_id=');
+      // information
+      array_push(
+        $page['infos'],
+        sprintf(
+          l10n('Category "%s" has been added'),
+          '<em>'.$category_name.'</em>'
+          )
+        );
+      // TODO: add the onclick="window.open(this.href); return false;"
+      // attribute with jQuery on upload.tpl side for href containing
+      // "cat_modify"
+    }
+  }
+
+  $image_ids = array();
+        
+  if (isset($_FILES) and !empty($_FILES['image_upload']))
+  {
+    $starttime = get_moment();
+
+  foreach ($_FILES['image_upload']['error'] as $idx => $error)
+  {
+    if (UPLOAD_ERR_OK == $error)
+    {
+      $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(PHPWG_ROOT_PATH.'admin/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
+      }
+    }
+  }
+  
+  $endtime = get_moment();
+  $elapsed = ($endtime - $starttime) * 1000;
+  // printf('%.2f ms', $elapsed);
+
+  } // if (!empty($_FILES))
+
+  if (isset($_POST['upload_id']))
+  {
+    // we're on a multiple upload, with uploadify and so on
+    $image_ids = $_SESSION['uploads'][ $_POST['upload_id'] ];
+
+    associate_images_to_categories(
+      $image_ids,
+      array($category_id)
+      );
+
+    $query = '
+UPDATE '.IMAGES_TABLE.'
+  SET level = '.$_POST['level'].'
+  WHERE id IN ('.implode(', ', $image_ids).')
+;';
+    pwg_query($query);
+    
+    invalidate_user_cache();
+  }
+  
+  $page['thumbnails'] = array();
+  foreach ($image_ids as $image_id)
+  {
+    // 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,
+    path,
+    tn_ext
+  FROM '.IMAGES_TABLE.'
+  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'
+      .'&amp;image_id='.$image_id
+      .'&amp;cat_id='.$category_id
+      ;
+
+    array_push($page['thumbnails'], $thumbnail);
+  }
+  
+  if (!empty($page['thumbnails']))
+  {
+    array_push(
+      $page['infos'],
+      sprintf(
+        l10n('%d photos uploaded'),
+        count($page['thumbnails'])
+        )
+      );
+    
+    if (0 != $_POST['level'])
+    {
+      array_push(
+        $page['infos'],
+        sprintf(
+          l10n('Privacy level set to "%s"'),
+          l10n(
+            sprintf('Level %d', $_POST['level'])
+            )
+          )
+        );
+    }
+
+    if ('existing' == $_POST['category_type'])
+    {
+      $query = '
+SELECT
+    COUNT(*)
+  FROM '.IMAGE_CATEGORY_TABLE.'
+  WHERE category_id = '.$category_id.'
+;';
+      list($count) = mysql_fetch_row(pwg_query($query));
+      $category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=cat_modify&amp;cat_id=');
+      
+      // information
+      array_push(
+        $page['infos'],
+        sprintf(
+          l10n('Category "%s" now contains %d photos'),
+          '<em>'.$category_name.'</em>',
+          $count
+          )
+        );
+    }
+
+    $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch='.implode(',', $image_ids);
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |                             template init                             |
+// +-----------------------------------------------------------------------+
+
+$uploadify_path = PHPWG_ROOT_PATH.'admin/include/uploadify';
+
+$template->assign(
+    array(
+      'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL,
+      'uploadify_path' => $uploadify_path,
+    )
+  );
+
+$upload_modes = array('html', 'multiple');
+
+$upload_mode = 'multiple';
+$upload_switch = 'html';
+if (isset($_GET['upload_mode']) and in_array($_GET['upload_mode'], $upload_modes))
+{
+  $index_of_upload_mode = array_flip($upload_modes);
+  $upload_mode_index = $index_of_upload_mode[ $_GET['upload_mode'] ];
+
+  $upload_mode = $_GET['upload_mode'];
+  $upload_switch = $upload_modes[ ($upload_mode_index + 1) % 2 ];
+}
+
+$template->assign(
+    array(
+      'upload_mode' => $upload_mode,
+      'switch_url' => PHOTOS_ADD_BASE_URL.'&amp;upload_mode='.$upload_switch,
+      'upload_id' => md5(rand()),
+      'session_id' => session_id(),
+      'pwg_token' => '1234abcd5678efgh',// get_pwg_token(),
+    )
+  );
+
+$template->append(
+  'head_elements',
+  '<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n"
+  );
+
+if (isset($page['thumbnails']))
+{
+  $template->assign(
+    array(
+      'thumbnails' => $page['thumbnails'],
+      )
+    );
+
+  // only display the batch link if we have more than 1 photo
+  if (count($page['thumbnails']) > 1)
+  {
+    $template->assign(
+      array(
+        'batch_link' => $page['batch_link'],
+        'batch_label' => sprintf(
+          l10n('Manage this set of %d photos'),
+          count($page['thumbnails'])
+          ),
+        )
+      );
+  }
+}
+
+$query = '
+SELECT id,name,uppercats,global_rank
+  FROM '.CATEGORIES_TABLE.'
+;';
+
+display_select_cat_wrapper(
+  $query,
+  array(),
+  'category_options'
+  );
+
+// image level options
+$tpl_options = array();
+foreach (array_reverse($conf['available_permission_levels']) as $level)
+{
+  $label = null;
+  
+  if (0 == $level)
+  {
+    $label = l10n('Everybody');
+  }
+  else
+  {
+    $labels = array();
+    $sub_levels = array_reverse($conf['available_permission_levels']);
+    foreach ($sub_levels as $sub_level)
+    {
+      if ($sub_level == 0 or $sub_level < $level)
+      {
+        break;
+      }
+      array_push(
+        $labels,
+        l10n(
+          sprintf(
+            'Level %d',
+            $sub_level
+            )
+          )
+        );
+    }
+    
+    $label = implode(', ', $labels);
+  }
+  $tpl_options[$level] = $label;
+}
+$selected_level = isset($_POST['level']) ? $_POST['level'] : 0;
+$template->assign(
+    array(
+      'level_options'=> $tpl_options,
+      'level_options_selected' => array($selected_level)
+    )
+  );
+
+// +-----------------------------------------------------------------------+
+// |                             setup errors                              |
+// +-----------------------------------------------------------------------+
+
+$setup_errors = array();
+
+$upload_base_dir = 'upload';
+$upload_dir = PHPWG_ROOT_PATH.$upload_base_dir;
+
+if (!is_dir($upload_dir))
+{
+  if (!is_writable(PHPWG_ROOT_PATH))
+  {
+    array_push(
+      $setup_errors,
+      sprintf(
+        l10n('Create the "%s" directory at the root of your Piwigo installation'),
+        $upload_base_dir
+        )
+      );
+  }
+}
+else
+{
+  if (!is_writable($upload_dir))
+  {
+    @chmod($upload_dir, 0777);
+
+    if (!is_writable($upload_dir))
+    {
+      array_push(
+        $setup_errors,
+        sprintf(
+          l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
+          $upload_base_dir
+          )
+        );
+    }
+  }
+}
+
+$template->assign(
+    array(
+      'setup_errors'=> $setup_errors,
+    )
+  );
+
+// +-----------------------------------------------------------------------+
+// |                           sending html code                           |
+// +-----------------------------------------------------------------------+
+
+$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+?>