From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/
---
program/steps/mail/getunread.inc | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index 431ba8a..a035f52 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/getunread.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -23,9 +23,15 @@
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 = $_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');
@@ -36,4 +42,4 @@
$OUTPUT->send();
-?>
+
--
Gitblit v1.9.1