From 7fe3811c65a7c63154f03610e289a6d196f3ae2e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 18 Jan 2012 06:10:46 -0500
Subject: [PATCH] Changed license to GNU GPLv3+ with exceptions for skins and plugins
---
program/steps/mail/mark.inc | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 18 deletions(-)
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c45131d..f165011 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,9 +3,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/mark.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: |
| Mark the submitted messages with the specified flag |
@@ -18,6 +21,10 @@
*/
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+ return;
+
$a_flags_map = array(
'undelete' => 'UNDELETED',
'delete' => 'DELETED',
@@ -26,28 +33,107 @@
'flagged' => 'FLAGGED',
'unflagged' => 'UNFLAGGED');
+$threading = (bool) $RCMAIL->storage->get_threading();
+
if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_value('_flag', RCUBE_INPUT_POST)))
{
$flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
- $marked = $IMAP->set_flag($uids, $flag);
- if($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid']))
- {
- $uids = get_input_value('_ruid', RCUBE_INPUT_POST);
- $read = $IMAP->set_flag($uids, 'SEEN');
-
- if ($read != -1)
- $OUTPUT->command('flag_deleted_as_read', $uids);
+ if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
+ // count messages before changing anything
+ $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+ $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
+ $count = sizeof(explode(',', $uids));
+ }
+
+ $marked = $RCMAIL->storage->set_flag($uids, $flag);
+
+ if (!$marked) {
+ // send error message
+ if ($_POST['_from'] != 'show')
+ $OUTPUT->command('list_mailbox');
+ rcmail_display_server_error('errormarking');
+ $OUTPUT->send();
+ exit;
+ }
+ else if (empty($_POST['_quiet'])) {
+ $OUTPUT->show_message('messagemarked', 'confirmation');
+ }
+
+ if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
+ $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
+ $read = $RCMAIL->storage->set_flag($ruids, 'SEEN');
+
+ if ($read && !$CONFIG['skip_deleted'])
+ $OUTPUT->command('flag_deleted_as_read', $ruids);
+ }
+
+ if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
+ rcmail_send_unread_count($RCMAIL->storage->get_folder());
+ }
+ else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
+ 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 {
+ $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();
+ }
+
+ $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);
+
+ // 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);
+ }
+ $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 ($count && $uids != '*' && ($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 = $RCMAIL->storage->list_messages($mbox, NULL, $sort_col, $sort_order,
+ $jump_back ? NULL : $count);
+
+ rcmail_js_message_list($a_headers, false);
+ }
}
-
- if ($marked != -1 && ($flag == 'SEEN' || $flag == 'UNSEEN'))
- {
- $mbox_name = $IMAP->get_mailbox_name();
- $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
}
$OUTPUT->send();
}
-
+
exit;
-?>
\ No newline at end of file
+
--
Gitblit v1.9.1