Changeset 70ee70a in github

Timestamp:

Dec 4, 2009 9:22:48 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

724cc1f

Parents:

efe5a55

Message:

• Fix counters of all folders are checked in 'getunread' action with check_all_folders disabled (#1486128)

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/getunread.inc (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

program/steps/mail/getunread.inc

@@ -6 +6 @@
  |                                                                       |
  | 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                                            |
  |                                                                       |
@@ -24 +24 @@
 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])) {