Changeset c3ab87b6 in github

Timestamp:

Oct 2, 2007 4:25:48 AM (6 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

9a3567a

Parents:

51e14a1

Message:

Better fix for messaage reloading after moving

File:

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

program/steps/mail/move_del.inc

@@ -20 +20 @@
 */
 
-// count pages before changing anything
+// count messages before changing anything
 $old_count = $IMAP->messagecount();
-$old_pages = ceil($old_count / $IMAP->page_size);
 
 // move messages
@@ -66 +65 @@
 
 
+$remaining = $old_count - $IMAP->page_size * $IMAP->list_page;
+
+// jump back one page (user removed the whole last page)
+if ($IMAP->list_page > 1 && $remaining <= 0)
+{
+  $IMAP->set_page($IMAP->list_page-1);
+  $_SESSION['page'] = $IMAP->list_page;
+  $jump_back = true;
+}
+
 // 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);
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
@@ -83 +93 @@
 
 // add new rows from next page (if any)
-if ($_POST['_from']!='show' && $old_pages>1 && $IMAP->list_page < $old_pages)
+if ($_POST['_from']!='show' && ($jump_back || $remaining > 0))
 {
   $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
@@ -89 +99 @@
   
   $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);