From 3ebac0167bf20104fb7a2a55934765117760264c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 18 Aug 2014 03:53:18 -0400
Subject: [PATCH] Only add zen-mode text labels in compose step
---
program/steps/mail/getunread.inc | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index af927fc..f708c8a 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/getunread.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Check all mailboxes for unread messages and update GUI |
@@ -14,32 +17,40 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-$a_folders = $IMAP->list_mailboxes();
+$a_folders = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail');
-if (!empty($a_folders))
-{
- $current = $IMAP->get_mailbox_name();
- $inbox = ($current == 'INBOX');
- $check_all = (bool)$RCMAIL->config->get('check_all_folders');
+if (!empty($a_folders)) {
+ $current = $RCMAIL->storage->get_folder();
+ $inbox = ($current == 'INBOX');
+ $trash = $RCMAIL->config->get('trash_mbox');
+ $check_all = (bool)$RCMAIL->config->get('check_all_folders');
- foreach ($a_folders as $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]));
+ foreach ($a_folders as $mbox) {
+ $unseen_old = rcmail_get_unseen_count($mbox);
- if ($unseen || !isset($_SESSION['unseen_count'][$mbox_row])) {
- $OUTPUT->command('set_unread_count', $mbox_row, $unseen, $inbox && $mbox_row == 'INBOX');
+ if (!$check_all && $unseen_old !== null && $mbox != $current) {
+ $unseen = $unseen_old;
+ }
+ else {
+ $unseen = $RCMAIL->storage->count($mbox, 'UNSEEN', $unseen_old === null);
+ }
+
+ // call it always for current folder, so it can update counter
+ // after possible message status change when opening a message
+ // not in preview frame
+ if ($unseen || $unseen_old === null || $mbox == $current) {
+ $OUTPUT->command('set_unread_count', $mbox, $unseen, $inbox && $mbox_row == 'INBOX');
+ }
+
+ rcmail_set_unseen_count($mbox, $unseen);
+
+ // set trash folder state
+ if ($mbox === $trash) {
+ $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox, 'EXISTS'));
+ }
}
- $_SESSION['unseen_count'][$mbox_row] = $unseen;
- }
}
$OUTPUT->send();
-
-
--
Gitblit v1.9.1