Imported Upstream version 0.1~rc2

[roundcube.git] / program / steps / mail / move_del.inc

diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 82e6e761140569f4e13ddb8a41e10c721c4b0dc9..ffe96fdad502ce6e3ddb6c777048435e9dfaaa88 100644 (file)
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -15,10 +15,14 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: move_del.inc 573 2007-05-18 11:29:25Z thomasb $
+ $Id: move_del.inc 848 2007-10-02 08:42:18Z thomasb $
 
 */
 
+// count messages before changing anything
+$old_count = $IMAP->messagecount();
+$old_pages = ceil($old_count / $IMAP->page_size);
+
 // move messages
 if ($_action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox']))
 {
@@ -61,10 +65,22 @@ if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->se
   $_SESSION['search'][$search_request] = $IMAP->refresh_search();
 
 
-// update message count display
 $msg_count = $IMAP->messagecount();
 $pages = ceil($msg_count / $IMAP->page_size);
+$nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
+$remaining = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
+
+// jump back one page (user removed the whole last page)
+if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0)
+{
+  $IMAP->set_page($IMAP->list_page-1);
+  $_SESSION['page'] = $IMAP->list_page;
+  $jump_back = true;
+}
+
+// update message count display
 $OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->set_env('current_page', $IMAP->list_page);
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
 
@@ -78,13 +94,14 @@ if ($_action=='moveto' && $target)
 $OUTPUT->command('set_quota', $IMAP->get_quota());
 
 // add new rows from next page (if any)
-if ($_POST['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
+if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0))
 {
   $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
   $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
   
   $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
-  $a_headers = array_slice($a_headers, -$count, $count);
+  if (!$jump_back)
+    $a_headers = array_slice($a_headers, -$count, $count);
 
   rcmail_js_message_list($a_headers);
 }