From 2baeac116abef9d5bcb748c687577d16dce868a0 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 08:17:08 -0500
Subject: [PATCH] Fix sorting and paging in cross-folder searches
---
program/steps/mail/search.inc | 224 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 147 insertions(+), 77 deletions(-)
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index e1690ee..5ce9fe6 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -1,107 +1,177 @@
<?php
+
/*
+-----------------------------------------------------------------------+
| steps/mail/search.inc |
| |
- | Search functions for rc webmail |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
| |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+ | |
+ | PURPOSE: |
+ | Mail messages search action |
+-----------------------------------------------------------------------+
| Author: Benjamin Smith <defitro@gmail.com> |
| Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
*/
$REMOTE_REQUEST = TRUE;
-// reset list_page
-$IMAP->set_page(1);
+// reset list_page and old search results
+$RCMAIL->storage->set_page(1);
+$RCMAIL->storage->set_search_set(NULL);
$_SESSION['page'] = 1;
// using encodeURI with javascript "should" give us
-// a correctly UTF-8 encoded query string
-$imap_charset = 'UTF-8';
+// a correctly encoded query string
+$imap_charset = RCUBE_CHARSET;
// get search string
-$str = get_input_value('_search', RCUBE_INPUT_GET);
-$mbox = get_input_value('_mbox', RCUBE_INPUT_GET);
-$search_request = md5($str);
+$str = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GET, true);
+$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET, true);
+$filter = rcube_utils::get_input_value('_filter', rcube_utils::INPUT_GET);
+$headers = rcube_utils::get_input_value('_headers', rcube_utils::INPUT_GET);
+$subject = array();
+$search_request = md5($mbox.$filter.$str);
+
+// add list filter string
+$search_str = $filter && $filter != 'ALL' ? $filter : '';
+
+$_SESSION['search_filter'] = $filter;
// Check the search string for type of search
-if (preg_match("/^from:/i", $str)) {
- list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER FROM" ,trim($srch), $imap_charset);
- finish_search($mbox, $search);
+if (preg_match("/^from:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['from'] = "HEADER FROM";
}
-else if (preg_match("/^to:/i", $str)) {
- list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER TO", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+else if (preg_match("/^to:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['to'] = "HEADER TO";
}
-else if (preg_match("/^cc:/i", $str)) {
- list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER CC", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+else if (preg_match("/^cc:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['cc'] = "HEADER CC";
}
-else if (preg_match("/^subject:/i", $str)) {
- list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER SUBJECT", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+else if (preg_match("/^bcc:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['bcc'] = "HEADER BCC";
}
-else if (preg_match("/^body:/i", $str)) {
- list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "TEXT", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+else if (preg_match("/^subject:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['subject'] = "HEADER SUBJECT";
}
-// search in subject and sender by default
+else if (preg_match("/^body:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['body'] = "BODY";
+}
+else if (strlen(trim($str))) {
+ if ($headers) {
+ foreach (explode(',', $headers) as $header) {
+ if ($header == 'text') {
+ // #1488208: get rid of other headers when searching by "TEXT"
+ $subject = array('text' => 'TEXT');
+ break;
+ }
+ else {
+ $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
+ }
+ }
+
+ // save search modifiers for the current folder to user prefs
+ $search_mods = rcmail_search_mods();
+ $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
+
+ $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
+ }
+ else {
+ // search in subject by default
+ $subject['subject'] = 'HEADER SUBJECT';
+ }
+}
+
+$search = isset($srch) ? trim($srch) : trim($str);
+
+if (!empty($subject)) {
+ $search_str .= str_repeat(' OR', count($subject)-1);
+ foreach ($subject as $sub) {
+ $search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
+ }
+}
+
+$search_str = trim($search_str);
+$sort_column = rcmail_sort_column();
+
+// TEMPORARY: search all folders
+$mboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail');
+
+// execute IMAP search
+if ($search_str) {
+ $RCMAIL->storage->search($mboxes, $search_str, $imap_charset, $sort_column);
+}
+
+// save search results in session
+if (!is_array($_SESSION['search'])) {
+ $_SESSION['search'] = array();
+}
+
+if ($search_str) {
+ $_SESSION['search'] = $RCMAIL->storage->get_search_set();
+ $_SESSION['last_text_search'] = $str;
+}
+$_SESSION['search_request'] = $search_request;
+
+// Get the headers
+$result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
+$count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+
+// Add 'folder' column to list
+if ($_SESSION['search'][1]->multi) {
+ $a_show_cols = $_SESSION['list_attrib']['columns'] ? $_SESSION['list_attrib']['columns'] : (array)$CONFIG['list_cols'];
+ if (!in_array('folder', $a_show_cols))
+ $a_show_cols[] = 'folder';
+
+ // make message UIDs unique by appending the folder name
+ foreach ($result_h as $i => $header) {
+ $header->uid .= '-'.$header->folder;
+ $header->flags['skip_mbox_check'] = true;
+ if ($header->parent_uid)
+ $header->parent_uid .= '-'.$header->folder;
+ }
+
+ $OUTPUT->command('select_folder', '');
+}
+
+// Make sure we got the headers
+if (!empty($result_h)) {
+ rcmail_js_message_list($result_h, false, $a_show_cols);
+ if ($search_str) {
+ $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
+ }
+
+ // remember last HIGHESTMODSEQ value (if supported)
+ // we need it for flag updates in check-recent
+ $data = $RCMAIL->storage->folder_data($mbox_name);
+ if (!empty($data['HIGHESTMODSEQ'])) {
+ $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
+ }
+}
+// handle IMAP errors (e.g. #1486905)
+else if ($err_code = $RCMAIL->storage->get_error_code()) {
+ $RCMAIL->display_server_error();
+}
else {
- $search = $IMAP->search($mbox, "HEADER SUBJECT", trim($str), $imap_charset);
- $search2 = $IMAP->search($mbox, "HEADER FROM", trim($str), $imap_charset);
- finish_search($mbox, array_unique(array_merge($search, $search2)));
+ $OUTPUT->show_message('searchnomatch', 'notice');
}
-
-// Complete the search display results or report error
-function finish_search($mbox, $search)
- {
- global $IMAP, $JS_OBJECT_NAME, $OUTPUT, $search_request;
- $commands = '';
- $count = 0;
-
- // Make sure our $search is legit..
- if (is_array($search) && $search[0] != '')
- {
- // Get the headers
- $result_h = $IMAP->list_header_set($mbox, $search, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
- $count = count($search);
-
- // save search results in session
- if (!is_array($_SESSION['search']))
- $_SESSION['search'] = array();
-
- // Make sure we got the headers
- if ($result_h != NULL)
- {
- $_SESSION['search'][$search_request] = join(',', $search);
- $commands = rcmail_js_message_list($result_h);
- $commands .= show_message('searchsuccessful', 'confirmation', array('nr' => $count));
- }
- }
- else
- {
- $commands = show_message('searchnomatch', 'warning');
- $search_request = -1;
- }
-
- // update message count display
- $pages = ceil($count/$IMAP->page_size);
- $commands .= sprintf("\nthis.set_env('search_request', '%s')\n", $search_request);
- $commands .= sprintf("this.set_env('messagecount', %d);\n", $count);
- $commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
- $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($count, 1));
- rcube_remote_response($commands);
- }
-
-?>
\ No newline at end of file
+// update message count display
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
+$OUTPUT->set_env('messagecount', $count);
+$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
+$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
+$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
+$OUTPUT->send();
--
Gitblit v1.9.1