diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-04 14:22:48 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-04 14:22:48 +0000 |
| commit | 3a8be7f27a7110e861abbaa68505a9c69669c8f8 (patch) | |
| tree | 203538569c15ff0faa2c0b89a075af34abcf58cb /roundcubemail | |
| parent | b41c0618308fcfdff4825079738243fe8919ba15 (diff) | |
- Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128)
git-svn-id: https://svn.roundcube.net/trunk@3163 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/getunread.inc | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 9d15fddca..fe5a3dc94 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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/roundcubemail/program/steps/mail/getunread.inc b/roundcubemail/program/steps/mail/getunread.inc index 431ba8a90..efae53f33 100644 --- a/roundcubemail/program/steps/mail/getunread.inc +++ b/roundcubemail/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'); |