From 5b3ed54e84590bdb6efbfe3c79c5e0129486ef1a Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Sun, 13 Dec 2009 13:28:47 -0500 Subject: [PATCH] - Plugin API: added 'quota' hook --- program/steps/mail/check_recent.inc | 86 ++++++++++++++++++++++++++++++------------ 1 files changed, 61 insertions(+), 25 deletions(-) diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index fbf8871..4b84273 100644 --- a/program/steps/mail/check_recent.inc +++ b/program/steps/mail/check_recent.inc @@ -5,43 +5,79 @@ | program/steps/mail/check_recent.inc | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005, RoundCube Dev. - Switzerland | + | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | - | Check for recent messages | + | Check for recent messages, in all mailboxes | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ - $Id$ + $Id: check_recent.inc 233 2006-06-26 17:31:20Z richs $ */ -$REMOTE_REQUEST = TRUE; -$mbox = $IMAP->get_mailbox_name(); +$a_mailboxes = $IMAP->list_mailboxes(); +$check_all = (bool)$RCMAIL->config->get('check_all_folders'); -if ($recent_count = $IMAP->messagecount(NULL, 'RECENT')) - { - $count = $IMAP->messagecount(); - $unread_count = $IMAP->messagecount(NULL, 'UNSEEN'); - - $commands = sprintf("this.set_unread_count('%s', %d, true);\n", addslashes($mbox), $unread_count); - $commands .= sprintf("this.set_env('messagecount', %d);\n", $count); - $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text()); - - // add new message headers to list - $a_headers = array(); - for ($i=$recent_count, $id=$count-$recent_count+1; $i>0; $i--, $id++) - $a_headers[] = $IMAP->get_headers($id, NULL, FALSE); - - $commands .= rcmail_js_message_list($a_headers, 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); + $_SESSION['unseen_count'][$mbox_name] = $unread_count; + + $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()); + + // 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; + + // 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, false); + } + } + else { + rcmail_send_unread_count($mbox_name, true); + } } + else if ($check_all) { + rcmail_send_unread_count($mbox_name, true); + } +} -if (strtoupper($mbox)!='INBOX' && $IMAP->messagecount('INBOX', 'RECENT')) - $commands = sprintf("this.set_unread_count('INBOX', %d);\n", $IMAP->messagecount('INBOX', 'UNSEEN')); +$OUTPUT->send(); - -rcube_remote_response($commands); -?> \ No newline at end of file +?> -- Gitblit v1.9.1