From cbeea3d4d092f6ae2310175a57fe15b43d608b33 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 17 Sep 2009 08:36:32 -0400
Subject: [PATCH] - some code improvements for r2959 change
---
program/steps/mail/move_del.inc | 158 +++++++++++++++++++++++++++++++---------------------
1 files changed, 95 insertions(+), 63 deletions(-)
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 8d31e3a..30102d9 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -5,7 +5,7 @@
| program/steps/mail/move_del.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,83 +19,115 @@
*/
-$REMOTE_REQUEST = TRUE;
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+ return;
+
+// count messages before changing anything
+$old_count = $IMAP->messagecount();
+$old_pages = ceil($old_count / $IMAP->page_size);
// move messages
-if ($_action=='moveto' && !empty($_GET['_uid']) && !empty($_GET['_target_mbox']))
- {
- $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_GET))));
- $target = get_input_value('_target_mbox', RCUBE_INPUT_GET);
- $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_GET));
-
- if (!$moved)
- {
- // send error message
- $commands = "this.list_mailbox();\n";
- $commands .= show_message('errormoving', 'error');
- rcube_remote_response($commands);
- exit;
- }
- }
+if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
+ $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
+ $target = get_input_value('_target_mbox', RCUBE_INPUT_POST);
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+ $moved = $IMAP->move_message($uids, $target, $mbox);
+
+ if (!$moved) {
+ // send error message
+ if ($_POST['_from'] != 'show')
+ $OUTPUT->command('list_mailbox');
+ $OUTPUT->show_message('errormoving', 'error');
+ $OUTPUT->send();
+ exit;
+ }
+
+ $addrows = true;
+}
// delete messages
-else if ($_action=='delete' && !empty($_GET['_uid']))
- {
- $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_GET))));
- $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_GET));
+else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
+ $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+ $del = $IMAP->delete_message($uids, $mbox);
- if (!$del)
- {
- // send error message
- $commands = "this.list_mailbox();\n";
- $commands .= show_message('errordeleting', 'error');
- rcube_remote_response($commands);
- exit;
+ if (!$del) {
+ // send error message
+ if ($_POST['_from'] != 'show')
+ $OUTPUT->command('list_mailbox');
+ $OUTPUT->show_message('errordeleting', 'error');
+ $OUTPUT->send();
+ exit;
}
- }
-
+
+ $addrows = true;
+}
// unknown action or missing query param
+else {
+ exit;
+}
+
+// refresh saved search set after moving some messages
+if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
+ $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+}
+
+if ($_POST['_from'] == 'show')
+{
+ if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC))
+ $OUTPUT->command('show_message', $next);
+ else
+ $OUTPUT->command('command', 'list');
+}
else
- {
- exit;
+{
+ $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;
}
-// refresh saved seach set after moving some messages
-if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set)
- $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+ // update message count display
+ $OUTPUT->set_env('messagecount', $msg_count);
+ $OUTPUT->set_env('current_page', $IMAP->list_page);
+ $OUTPUT->set_env('pagecount', $pages);
-
-// update message count display
-$msg_count = $IMAP->messagecount();
-$pages = ceil($msg_count / $IMAP->page_size);
-$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($msg_count));
-$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
-
-
-// update mailboxlist
-$mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
-
-if ($_action=='moveto' && $target)
- $commands .= sprintf("this.set_unread_count('%s', %d);\n", $target, $IMAP->messagecount($target, 'UNSEEN'));
-
-$commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota());
-
-// add new rows from next page (if any)
-if ($_GET['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
- {
- $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'];
+ // update mailboxlist
+ $mbox = $IMAP->get_mailbox_name();
+ $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0;
+ $old_unseen = $_SESSION['unseen_count'][$mbox];
- $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
- $a_headers = array_slice($a_headers, -$count, $count);
-
- $commands .= rcmail_js_message_list($a_headers);
+ if ($old_unseen != $unseen_count) {
+ $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
+ $_SESSION['unseen_count'][$mbox] = $unseen_count;
}
+ if ($RCMAIL->action=='moveto' && $target) {
+ rcmail_send_unread_count($target, true);
+ }
+
+ $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
+
+ // add new rows from next page (if any)
+ if ($addrows && ($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, $count);
+
+ rcmail_js_message_list($a_headers, false, false);
+ }
+}
// send response
-rcube_remote_response($commands);
+$OUTPUT->send();
-exit;
?>
--
Gitblit v1.9.1