summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-10-02 08:25:48 +0000
committerthomascube <thomas@roundcube.net>2007-10-02 08:25:48 +0000
commitc3ab87b6dffaca1958e362bc19a7f907cff31bf2 (patch)
treefeeb36858ae97578625114c50c0a3e8f1f6351bb /program/steps/mail
parent51e14a1fd9c8d622322e2ddaafa464039dced605 (diff)
Better fix for messaage reloading after moving
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/move_del.inc19
1 files changed, 15 insertions, 4 deletions
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index b24fa22a2..03695e920 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -19,9 +19,8 @@
*/
-// count pages before changing anything
+// 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']))
@@ -65,10 +64,21 @@ if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->se
$_SESSION['search'][$search_request] = $IMAP->refresh_search();
+$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));
@@ -82,13 +92,14 @@ if ($_action=='moveto' && $target)
$OUTPUT->command('set_quota', $IMAP->get_quota());
// 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'];
$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);
}