Index: /trunk/admin/include/photos_add_direct_prepare.inc.php
===================================================================
--- /trunk/admin/include/photos_add_direct_prepare.inc.php	(revision 28918)
+++ /trunk/admin/include/photos_add_direct_prepare.inc.php	(revision 28919)
@@ -22,37 +22,7 @@
 // +-----------------------------------------------------------------------+
 
-
-// +-----------------------------------------------------------------------+
-// | Uploaded photos                                                       |
-// +-----------------------------------------------------------------------+
-
-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'])
-          ),
-        )
-      );
-  }
-}
-
 // +-----------------------------------------------------------------------+
 // | Photo selection                                                       |
 // +-----------------------------------------------------------------------+
-
-$uploadify_path = PHPWG_ROOT_PATH.'admin/include/uploadify';
 
 $upload_max_filesize = min(
@@ -73,5 +43,4 @@
     array(
       'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL,
-      'uploadify_path' => $uploadify_path,
       'upload_max_filesize' => $upload_max_filesize,
       'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand,
@@ -118,27 +87,8 @@
 
 
-$upload_modes = array('html', 'multiple');
-$upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple';
-
-if (isset($_GET['upload_mode']) and $upload_mode != $_GET['upload_mode'] and in_array($_GET['upload_mode'], $upload_modes))
-{
-  $upload_mode = $_GET['upload_mode'];
-  conf_update_param('upload_mode', $upload_mode);
-}
-
-// what is the upload switch mode
-$index_of_upload_mode = array_flip($upload_modes);
-$upload_mode_index = $index_of_upload_mode[$upload_mode];
-$upload_switch = $upload_modes[ ($upload_mode_index + 1) % 2 ];
-
-$template->assign(
-    array(
-      'upload_mode' => $upload_mode,
-      'form_action' => PHOTOS_ADD_BASE_URL.'&amp;upload_mode='.$upload_mode.'&amp;processed=1',
-      'switch_url' => PHOTOS_ADD_BASE_URL.'&amp;upload_mode='.$upload_switch,
-      'upload_id' => md5(rand()),
-      'session_id' => session_id(),
+$template->assign(
+    array(
+      'form_action' => PHOTOS_ADD_BASE_URL,
       'pwg_token' => get_pwg_token(),
-      'another_upload_link' => PHOTOS_ADD_BASE_URL.'&amp;upload_mode='.$upload_mode,
     )
   );
@@ -152,5 +102,5 @@
 }
 
-if ('html' == $upload_mode)
+if (false) // TODO manage zip files in pwg.images.upload
 {
   $upload_file_types.= ', zip';
@@ -279,5 +229,5 @@
     array(
       'setup_warnings' => $setup_warnings,
-      'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'&amp;upload_mode='.$upload_mode.'&amp;hide_warnings=1'
+      'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'&amp;hide_warnings=1'
       )
     );
Index: unk/admin/include/photos_add_direct_process.inc.php
===================================================================
--- /trunk/admin/include/photos_add_direct_process.inc.php	(revision 28918)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | 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 (isset($_GET['processed']))
-{
-//   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();
-
-  // sometimes, you have submitted the form but you have nothing in $_POST
-  // and $_FILES. This may happen when you have an HTML upload and you
-  // exceeded the post_max_size (but not the upload_max_size)
-  if (!isset($_POST['submit_upload']))
-  {
-    $page['errors'][] = l10n(
-      'The uploaded files exceed the post_max_size directive in php.ini: %sB',
-      ini_get('post_max_size')
-      );
-  }
-  else
-  {
-    $category_id = $_POST['category'];
-  }
-
-  if (isset($_POST['onUploadError']) and is_array($_POST['onUploadError']) and count($_POST['onUploadError']) > 0)
-  {
-    foreach ($_POST['onUploadError'] as $error)
-    {
-      $page['errors'][] = $error;
-    }
-  }
-    
-  $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 = $conf['upload_dir'].'/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_once(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)))
-            {
-              $indexes_to_extract[] = $node['index'];
-              
-              $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))
-      {
-        $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']
-          );
-
-        $image_ids[] = $image_id;
-
-        // TODO: if $image_id is not an integer, something went wrong
-      }
-    }
-    else
-    {
-      $error_message = file_upload_error_message($error);
-      
-      $page['errors'][] = l10n(
-        'Error on file "%s" : %s',
-        $_FILES['image_upload']['name'][$idx],
-        $error_message
-        );
-    }
-  }
-  
-  $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
-    if (isset($_SESSION['uploads_error'][ $_POST['upload_id'] ]))
-    {
-      foreach ($_SESSION['uploads_error'][ $_POST['upload_id'] ] as $error)
-      {
-        $page['errors'][] = $error;
-      }
-    }
-
-    if (isset($_SESSION['uploads'][ $_POST['upload_id'] ]))
-    {
-      $image_ids = $_SESSION['uploads'][ $_POST['upload_id'] ];
-    }
-  }
-  
-  $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
-    id,
-    file,
-    path
-  FROM '.IMAGES_TABLE.'
-  WHERE id = '.$image_id.'
-;';
-    $image_infos = pwg_db_fetch_assoc(pwg_query($query));
-
-    $thumbnail['file'] = $image_infos['file'];
-    
-    $thumbnail['src'] = DerivativeImage::thumb_url($image_infos);
-
-    // 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 (batch_manager_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'] = get_root_url().'admin.php?page=photo-'.$image_id.'&amp;cat_id='.$category_id;
-
-    $page['thumbnails'][] = $thumbnail;
-  }
-  
-  if (!empty($page['thumbnails']))
-  {
-    $page['infos'][] = l10n('%d photos uploaded', count($page['thumbnails']));
-    
-    if (0 != $_POST['level'])
-    {
-      $page['infos'][] = l10n(
-        'Privacy level set to "%s"',
-        l10n(sprintf('Level %d', $_POST['level']))
-        );
-    }
-
-    $query = '
-SELECT
-    COUNT(*)
-  FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE category_id = '.$category_id.'
-;';
-    list($count) = pwg_db_fetch_row(pwg_query($query));
-    $category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=album-');
-    
-    // information
-    $page['infos'][] = l10n(
-      'Album "%s" now contains %d photos',
-      '<em>'.$category_name.'</em>',
-      $count
-      );
-    
-    $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch='.implode(',', $image_ids);
-  }
-}
-
-?>
Index: /trunk/admin/photos_add_direct.php
===================================================================
--- /trunk/admin/photos_add_direct.php	(revision 28918)
+++ /trunk/admin/photos_add_direct.php	(revision 28919)
@@ -59,10 +59,4 @@
 
 // +-----------------------------------------------------------------------+
-// |                             process form                              |
-// +-----------------------------------------------------------------------+
-
-include_once(PHPWG_ROOT_PATH.'admin/include/photos_add_direct_process.inc.php');
-
-// +-----------------------------------------------------------------------+
 // |                             prepare form                              |
 // +-----------------------------------------------------------------------+
