From e538b3dc7d740c5a9213ef352437f249be856d3a Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 13 Nov 2008 10:30:06 +0000 Subject: - Added message status filter + fixes for r2046 (searching with SORT) --- program/steps/mail/list.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'program/steps/mail/list.inc') diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index a868f9cc6..2078262eb 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -41,6 +41,17 @@ else $mbox_name = $IMAP->get_mailbox_name(); +// initialize searching result if search_filter is used +if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') +{ + $search_request = md5($mbox_name.$_SESSION['search_filter']); + + $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col); + $_SESSION['search'][$search_request] = $IMAP->get_search_set(); + $OUTPUT->set_env('search_request', $search_request); +} + + // fetch message headers if ($IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh']))) $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order); @@ -55,8 +66,6 @@ $OUTPUT->set_env('pagecount', $pages); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count)); $OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text()); - - // add message rows if (isset($a_headers) && count($a_headers)) rcmail_js_message_list($a_headers); -- cgit v1.2.3