From e4a4ca19480690193e36e14ef6b9d592e73e9e9c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 24 Nov 2011 09:51:43 -0500
Subject: [PATCH] - Performance improvements
---
program/steps/mail/mark.inc | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index 1a2838c..c232d8c 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -3,8 +3,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/mark.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -42,21 +42,24 @@
}
$marked = $IMAP->set_flag($uids, $flag);
-
- if ($marked == -1) {
+
+ if (!$marked) {
// send error message
if ($_POST['_from'] != 'show')
$OUTPUT->command('list_mailbox');
- $OUTPUT->show_message('errormarking', 'error');
+ 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 = $IMAP->set_flag($ruids, 'SEEN');
-
- if ($read != -1 && !$CONFIG['skip_deleted'])
+
+ if ($read && !$CONFIG['skip_deleted'])
$OUTPUT->command('flag_deleted_as_read', $ruids);
}
@@ -72,7 +75,7 @@
} else {
// 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();
+ $_SESSION['search'] = $IMAP->refresh_search();
}
$msg_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
@@ -95,13 +98,13 @@
// update mailboxlist
$mbox = $IMAP->get_mailbox_name();
$unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0;
- $old_unseen = $_SESSION['unseen_count'][$mbox];
+ $old_unseen = rcmail_get_unseen_count($mbox);
if ($old_unseen != $unseen_count) {
$OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
- $_SESSION['unseen_count'][$mbox] = $unseen_count;
+ rcmail_set_unseen_count($mbox, $unseen_count);
}
- $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
+ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
if ($IMAP->threading)
$count = get_input_value('_count', RCUBE_INPUT_POST);
@@ -110,17 +113,17 @@
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 = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
$jump_back ? NULL : $count);
-
- rcmail_js_message_list($a_headers, false, false);
+
+ rcmail_js_message_list($a_headers, false);
}
}
}
-
+
$OUTPUT->send();
}
-
+
exit;
-?>
+
--
Gitblit v1.9.1