Imported Upstream version 0.2.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 a2100f1d24a5386262ab537dd3a6debf44208f79..54e1702de192e85915fb4114e836317d499a6342 100644 (file)
--- 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-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -20,39 +20,56 @@
 */
 
 $a_mailboxes = $IMAP->list_mailboxes();
+$check_all = (bool)$RCMAIL->config->get('check_all_folders');
 
-foreach ($a_mailboxes as $mbox_name)
-  {
-  if ($mbox_name == $IMAP->get_mailbox_name())
-    {
-    if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE))
-      {
-      $count = $IMAP->messagecount(NULL, 'ALL', TRUE);
+foreach ($a_mailboxes as $mbox_name) {
+  if ($mbox_name == $IMAP->get_mailbox_name()) {
+    if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE)) {
+      // 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();
+      } else {
+        $all_count = $IMAP->messagecount(NULL, 'ALL', TRUE);
+      }
+      
       $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
 
-      $OUTPUT->set_env('messagecount', $count);
-      $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, true);
-      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text());
-      $OUTPUT->command('set_quota', $IMAP->get_quota());
-
-      // add new message headers to list
-      $a_headers = array();
-      for ($i=$recent_count, $id=$count-$recent_count+1; $i>0; $i--, $id++)
-        {
-        $header = $IMAP->get_headers($id, NULL, FALSE);
-        if ($header->recent)
-          $a_headers[] = $header;
-        }
-
-      rcmail_js_message_list($a_headers, TRUE);
+      $OUTPUT->set_env('messagecount', $all_count);
+      $OUTPUT->set_env('pagesize', $IMAP->page_size);
+      $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size));
+      $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, ($mbox_name == 'INBOX'));
+      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count));
+
+      if (rcmail::get_instance()->config->get('focus_on_new_message',true))
+        $OUTPUT->command('new_message_focus');
+
+      if (!empty($_GET['_quota']))
+        $OUTPUT->command('set_quota', rcmail_quota_content($IMAP->get_quota()));
+
+      // "No-list" mode, don't get messages
+      if (empty($_GET['_list']))
+        continue;
+
+      // use SEARCH/SORT to find recent messages
+      $search_str = 'RECENT';
+      if ($search_request)
+        $search_str .= ' '.$IMAP->search_string;
+
+      $result = $IMAP->search($mbox_name, $search_str, NULL, 'date');
+
+      if ($result) {
+        // get the headers
+        $result_h = $IMAP->list_headers($mbox_name, 1, 'date', 'DESC');
+        // add to the list
+       rcmail_js_message_list($result_h, TRUE);
       }
     }
-  else
-    {
-    if ($IMAP->messagecount($mbox_name, 'RECENT'))
-      $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'));
-    }
   }
+  else if ($unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', $check_all)) {
+    $OUTPUT->command('set_unread_count', $mbox_name, $unseen);
+  }
+}
 
 $OUTPUT->send();