From 7c9d922b96f9a88b350d6e07f5bde84ccc40f9b0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 02 Mar 2010 16:27:53 -0500
Subject: [PATCH] New recent check based on UIDs
---
program/steps/mail/check_recent.inc | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index a066853..caf8b82 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -5,7 +5,7 @@
| program/steps/mail/check_recent.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -15,25 +15,27 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: check_recent.inc 233 2006-06-26 17:31:20Z richs $
+ $Id$
*/
$a_mailboxes = $IMAP->list_mailboxes();
-$check_all = (bool)$RCMAIL->config->get('check_all_folders');
+$check_all = !empty($_GET['_refresh']) || (bool)$RCMAIL->config->get('check_all_folders');
+// check recent/unseen counts for all mailboxes
foreach ($a_mailboxes as $mbox_name) {
if ($mbox_name == $IMAP->get_mailbox_name()) {
- if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE)) {
+ if ($recents = $IMAP->recent_uids($mbox_name)) {
// refresh saved search set
if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) {
$_SESSION['search'][$search_request] = $IMAP->refresh_search();
- $all_count = $IMAP->messagecount();
- } else {
- $all_count = $IMAP->messagecount(NULL, 'ALL', TRUE);
}
+ // get overall message count; allow caching because rcube_imap::recent_uids() did a refresh
+ $all_count = $IMAP->messagecount();
+
$unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
+ $_SESSION['unseen_count'][$mbox_name] = $unread_count;
$OUTPUT->set_env('messagecount', $all_count);
$OUTPUT->set_env('pagesize', $IMAP->page_size);
@@ -41,33 +43,36 @@
$OUTPUT->command('set_unread_count', $mbox_name, $unread_count, ($mbox_name == 'INBOX'));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count));
- if (rcmail::get_instance()->config->get('focus_on_new_message',true))
+ if ($RCMAIL->config->get('focus_on_new_message',true))
$OUTPUT->command('new_message_focus');
if (!empty($_GET['_quota']))
- $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+
+ // trigger plugin hook
+ $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name, 'count' => count($recents)));
// "No-list" mode, don't get messages
if (empty($_GET['_list']))
continue;
// use SEARCH/SORT to find recent messages
- $search_str = 'RECENT';
+ $search_str = 'UID '.min($recents).':'.max($recents);
if ($search_request)
$search_str .= ' '.$IMAP->search_string;
- $result = $IMAP->search($mbox_name, $search_str, NULL, 'date');
-
- if ($result) {
- // get the headers
+ if ($IMAP->search($mbox_name, $search_str, NULL, 'date')) {
+ // get the headers and add them to the list
$result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
- // add to the list
- rcmail_js_message_list($result_h, TRUE);
+ rcmail_js_message_list($result_h, true, false);
}
}
+ else {
+ rcmail_send_unread_count($mbox_name, true);
+ }
}
- else if ($unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) {
- $OUTPUT->command('set_unread_count', $mbox_name, $unseen);
+ else if ($check_all) {
+ rcmail_send_unread_count($mbox_name, true);
}
}
--
Gitblit v1.9.1