Imported Upstream version 0.3.1

[roundcube.git] / program / steps / mail / check_recent.inc

diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 54e1702de192e85915fb4114e836317d499a6342..094c429d4683a31848c53a6a038bd82e6828b0ea 100644 (file)
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -28,12 +28,13 @@ foreach ($a_mailboxes as $mbox_name) {
       // refresh saved search set
       if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) {
         $_SESSION['search'][$search_request] = $IMAP->refresh_search();
-       $all_count = $IMAP->messagecount();
+        $all_count = $IMAP->messagecount();
       } else {
         $all_count = $IMAP->messagecount(NULL, 'ALL', TRUE);
       }
       
       $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
+      $_SESSION['unseen_count'][$mbox_name] = $unread_count;
 
       $OUTPUT->set_env('messagecount', $all_count);
       $OUTPUT->set_env('pagesize', $IMAP->page_size);
@@ -47,6 +48,9 @@ foreach ($a_mailboxes as $mbox_name) {
       if (!empty($_GET['_quota']))
         $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
 
+      // trigger plugin hook
+      $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name, 'count' => $unread_count));
+
       // "No-list" mode, don't get messages
       if (empty($_GET['_list']))
         continue;
@@ -62,12 +66,15 @@ foreach ($a_mailboxes as $mbox_name) {
         // get the headers
         $result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
         // add to the list
-       rcmail_js_message_list($result_h, TRUE);
+        rcmail_js_message_list($result_h, true, false);
       }
     }
+    else {
+      rcmail_send_unread_count($mbox_name, true);
+    }
   }
-  else if ($unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) {
-    $OUTPUT->command('set_unread_count', $mbox_name, $unseen);
+  else if ($check_all) {
+    rcmail_send_unread_count($mbox_name, true);
   }
 }