From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/steps/mail/move_del.inc | 197 ++++++++++++++++++++++++++++++------------------
1 files changed, 123 insertions(+), 74 deletions(-)
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index b24fa22..37157b7 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/move_del.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Move the submitted messages to a specific mailbox or delete them |
@@ -14,87 +17,133 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-// count pages before changing anything
-$old_count = $IMAP->messagecount();
-$old_pages = ceil($old_count / $IMAP->page_size);
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+ return;
+
+// count messages before changing anything
+$threading = (bool) $RCMAIL->storage->get_threading();
+$old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+$old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
// move messages
-if ($_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);
- $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_POST));
-
- if (!$moved)
- {
- // send error message
- $OUTPUT->command('list_mailbox');
- $OUTPUT->show_message('errormoving', 'error');
- $OUTPUT->send();
- exit;
- }
-}
+if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
+ $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
+ $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+ $moved = $RCMAIL->storage->move_message($uids, $target, $mbox);
+
+ if (!$moved) {
+ // send error message
+ if ($_POST['_from'] != 'show')
+ $OUTPUT->command('list_mailbox');
+ rcmail_display_server_error('errormoving');
+ $OUTPUT->send();
+ exit;
+ }
+ else {
+ $OUTPUT->show_message('messagemoved', 'confirmation');
+ }
+
+ $addrows = true;
+}
// delete messages
-else if ($_action=='delete' && !empty($_POST['_uid']))
-{
- $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
- $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_POST));
-
- if (!$del)
- {
- // send error message
- $OUTPUT->command('list_mailbox');
- $OUTPUT->show_message('errordeleting', 'error');
+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, true);
+
+ $del = $RCMAIL->storage->delete_message($uids, $mbox);
+
+ if (!$del) {
+ // send error message
+ if ($_POST['_from'] != 'show')
+ $OUTPUT->command('list_mailbox');
+ rcmail_display_server_error('errordeleting');
+ $OUTPUT->send();
+ exit;
+ }
+ else {
+ $OUTPUT->show_message('messagedeleted', 'confirmation');
+ }
+
+ $addrows = true;
+}
+// unknown action or missing query param
+else {
+ $OUTPUT->show_message('internalerror', 'error');
$OUTPUT->send();
exit;
+}
+
+$search_request = get_input_value('_search', RCUBE_INPUT_GPC);
+
+// refresh saved search set after moving some messages
+if ($search_request && $RCMAIL->storage->get_search_set()) {
+ $_SESSION['search'] = $RCMAIL->storage->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
+{
+ $msg_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+ $page_size = $RCMAIL->storage->get_pagesize();
+ $page = $RCMAIL->storage->get_page();
+ $pages = ceil($msg_count / $page_size);
+ $nextpage_count = $old_count - $page_size * $page;
+ $remaining = $msg_count - $page_size * ($page - 1);
+
+ // jump back one page (user removed the whole last page)
+ if ($page > 1 && $remaining == 0) {
+ $page -= 1;
+ $RCMAIL->storage->set_page($page);
+ $_SESSION['page'] = $page;
+ $jump_back = true;
+ }
+
+ // update message count display
+ $OUTPUT->set_env('messagecount', $msg_count);
+ $OUTPUT->set_env('current_page', $page);
+ $OUTPUT->set_env('pagecount', $pages);
+ $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox, 'EXISTS', true));
+
+ // update mailboxlist
+ $mbox = $RCMAIL->storage->get_folder();
+ $unseen_count = $msg_count ? $RCMAIL->storage->count($mbox, 'UNSEEN') : 0;
+ $old_unseen = rcmail_get_unseen_count($mbox);
+
+ if ($old_unseen != $unseen_count) {
+ $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
+ rcmail_set_unseen_count($mbox, $unseen_count);
+ }
+
+ if ($RCMAIL->action == 'moveto' && strlen($target)) {
+ rcmail_send_unread_count($target, true);
+ }
+
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
+
+ if ($threading) {
+ $count = get_input_value('_count', RCUBE_INPUT_POST);
+ }
+
+ // add new rows from next page (if any)
+ if ($addrows && $count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
+ $a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
+ rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
+
+ rcmail_js_message_list($a_headers, false);
}
}
-
-// unknown action or missing query param
-else
- exit;
-
-// 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
-$msg_count = $IMAP->messagecount();
-$pages = ceil($msg_count / $IMAP->page_size);
-$OUTPUT->set_env('pagecount', $pages);
-$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
-
-
-// update mailboxlist
-$mbox = $IMAP->get_mailbox_name();
-$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
-
-if ($_action=='moveto' && $target)
- $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN'));
-
-$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)
-{
- $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);
-
- rcmail_js_message_list($a_headers);
-}
-
// send response
$OUTPUT->send();
-
-?>
--
Gitblit v1.9.1