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

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)

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');