From 011b02e75b6fca2a953971fd1bee3135f283b8cb Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 11 Jun 2009 13:35:03 +0000 Subject: - speed up: don't count UNSEEN if mailbox is empty --- program/steps/mail/mark.inc | 5 ++--- program/steps/mail/move_del.inc | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index 58a6f79df..6a8a3ca90 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.inc @@ -91,9 +91,8 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va // update mailboxlist $mbox = $IMAP->get_mailbox_name(); - $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); - -// $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota())); + $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0; + $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX')); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); // add new rows from next page (if any) diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 9d7d77957..df7bef981 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -101,7 +101,8 @@ else // update mailboxlist $mbox = $IMAP->get_mailbox_name(); - $OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX')); + $unseen_count = $msg_count ? $IMAP->messagecount($mbox, 'UNSEEN') : 0; + $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX')); if ($RCMAIL->action=='moveto' && $target) { $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN')); -- cgit v1.2.3