1 files changed, 22 insertions, 12 deletions

diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index d2d27a2ca..70f4c03a6 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/check_recent.inc                                   |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,7 @@
 
 // If there's no folder or messages list, there's nothing to update
 // This can happen on 'refresh' request
-if (empty($_REQUEST['_folderlist']) && empty($_REQUEST['_list'])) {
+if (empty($_POST['_folderlist']) && empty($_POST['_list'])) {
     return;
 }
 
@@ -29,10 +29,18 @@ $trash     = $RCMAIL->config->get('trash_mbox');
 $current   = $RCMAIL->storage->get_folder();
 $check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders');
 
+$search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
+if ($search_request && $_SESSION['search_request'] != $search_request) {
+    $search_request = null;
+}
+
 // list of folders to check
 if ($check_all) {
     $a_mailboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail');
 }
+else if ($search_request && is_object($_SESSION['search'][1])) {
+    $a_mailboxes = (array) $_SESSION['search'][1]->get_parameters('MAILBOX');
+}
 else {
     $a_mailboxes = (array) $current;
     if ($current != 'INBOX') {
@@ -46,7 +54,7 @@ $a_mailboxes = $plugin['folders'];
 
 // check recent/unseen counts
 foreach ($a_mailboxes as $mbox_name) {
-    $is_current = $mbox_name == $current;
+    $is_current = $mbox_name == $current || ($search_request && is_object($_SESSION['search'][1]) && in_array($mbox_name, (array)$_SESSION['search'][1]->get_parameters('MAILBOX')));
     if ($is_current) {
         // Synchronize mailbox cache, handle flag changes
         $RCMAIL->storage->folder_sync($mbox_name);
@@ -66,21 +74,23 @@ foreach ($a_mailboxes as $mbox_name) {
 
     if ($status && $is_current) {
         // refresh saved search set
-        $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
-        if ($search_request && isset($_SESSION['search'])
-            && $_SESSION['search_request'] == $search_request
-        ) {
+        if ($search_request && isset($_SESSION['search'])) {
+            unset($search_request);  // only do this once
             $_SESSION['search'] = $RCMAIL->storage->refresh_search();
+            if ($_SESSION['search'][1]->multi)
+                $mbox_name = '';
         }
 
-        if (!empty($_GET['_quota']))
+        if (!empty($_POST['_quota'])) {
             $OUTPUT->command('set_quota', $RCMAIL->quota_content());
+        }
 
-        $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
+        $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS', true));
 
         // "No-list" mode, don't get messages
-        if (empty($_GET['_list']))
+        if (empty($_POST['_list'])) {
             continue;
+        }
 
         // get overall message count; allow caching because rcube_storage::folder_status()
         // did a refresh but only in list mode
@@ -116,7 +126,7 @@ foreach ($a_mailboxes as $mbox_name) {
         }
     }
     // handle flag updates
-    else if ($is_current && ($uids = rcube_utils::get_input_value('_uids', rcube_utils::INPUT_GPC))) {
+    else if ($is_current && ($uids = rcube_utils::get_input_value('_uids', rcube_utils::INPUT_GPC)) && empty($search_request)) {
         $data = $RCMAIL->storage->folder_data($mbox_name);
 
         if (empty($_SESSION['list_mod_seq']) || $_SESSION['list_mod_seq'] != $data['HIGHESTMODSEQ']) {
@@ -136,7 +146,7 @@ foreach ($a_mailboxes as $mbox_name) {
 
     // set trash folder state
     if ($mbox_name === $trash) {
-        $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
+        $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS', true));
     }
 }