diff options
| author | alecpl <alec@alec.pl> | 2009-12-04 14:22:48 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-12-04 14:22:48 +0000 |
| commit | 70ee70aeac5fcae71cf29eab83ddc82739be3459 (patch) | |
| tree | 44b531417176b2b7ebf3b5cc7e3c0cb30f75aeda | |
| parent | efe5a55c4c5d4bd2ba7d5398d33824a45f628f3a (diff) | |
- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/getunread.inc | 12 |
2 files changed, 10 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128) - Fix displaying alternative parts in messages of type message/rfc822 (#1486246) - Fix possible messages exposure when using Roundcube behind a proxy (#1486281) - Fix unicode para and line separators in javascript response (#1486310) diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc index 431ba8a90..efae53f33 100644 --- a/program/steps/mail/getunread.inc +++ b/program/steps/mail/getunread.inc @@ -5,7 +5,7 @@ | program/steps/mail/getunread.inc | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | + | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -23,9 +23,15 @@ $a_folders = $IMAP->list_mailboxes(); if (!empty($a_folders)) { - $inbox = ($IMAP->get_mailbox_name() == 'INBOX'); + $current = $IMAP->get_mailbox_name(); + $inbox = ($current == 'INBOX'); + $check_all = (bool)$RCMAIL->config->get('check_all_folders'); + foreach ($a_folders as $mbox_row) { - $unseen = $IMAP->messagecount($mbox_row, 'UNSEEN', !isset($_SESSION['unseen_count'][$mbox_row])); + if (!$check_all && isset($_SESSION['unseen_count'][$mbox_row]) && $mbox_row != $current) + $unseen = isset($_SESSION['unseen_count'][$mbox_row]); + else + $unseen = $IMAP->messagecount($mbox_row, 'UNSEEN', !isset($_SESSION['unseen_count'][$mbox_row])); if ($unseen || !isset($_SESSION['unseen_count'][$mbox_row])) { $OUTPUT->command('set_unread_count', $mbox_row, $unseen, $inbox && $mbox_row == 'INBOX'); |