Changeset 848 in subversion

Timestamp:

Oct 2, 2007 4:42:18 AM (6 years ago)

Author:

thomasb

Message:

Fix of the better fix of the bugfix :-)

File:

• trunk/roundcubemail/program/steps/mail/move_del.inc (modified) (4 diffs)

trunk/roundcubemail/program/steps/mail/move_del.inc

@@ -22 +22 @@
 // count messages before changing anything
 $old_count = $IMAP->messagecount();
+$old_pages = ceil($old_count / $IMAP->page_size);
 
 // move messages
@@ -65 +66 @@
 
 
-$remaining = $old_count - $IMAP->page_size * $IMAP->list_page;
+$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 && $remaining <= 0)
+if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0)
 {
   $IMAP->set_page($IMAP->list_page-1);
@@ -76 +80 @@
 
 // update message count display
-$msg_count = $IMAP->messagecount();
-$pages = ceil($msg_count / $IMAP->page_size);
 $OUTPUT->set_env('pagecount', $pages);
 $OUTPUT->set_env('current_page', $IMAP->list_page);
@@ -93 +95 @@
 
 // add new rows from next page (if any)
-if ($_POST['_from']!='show' && ($jump_back || $remaining > 0))
+if ($_POST['_from']!='show' && ($jump_back || $nextpage_count > 0))
 {
   $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];