From b6100d9ed21f355b6b492d30aa3426a87be96298 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 05:41:09 -0500
Subject: [PATCH] Merge branch 'dev-multi-folder-search' of github.com:roundcube/roundcubemail into dev-multi-folder-search after rebasing to master
---
program/steps/mail/search.inc | 180 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 114 insertions(+), 66 deletions(-)
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index db5424b..67fee75 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -1,14 +1,18 @@
<?php
+
/*
+-----------------------------------------------------------------------+
| steps/mail/search.inc |
| |
- | Search functions for rc webmail |
+ | 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> |
@@ -24,13 +28,13 @@
// using encodeURI with javascript "should" give us
// a correctly encoded query string
-$imap_charset = RCMAIL_CHARSET;
+$imap_charset = RCUBE_CHARSET;
// get search string
-$str = get_input_value('_q', RCUBE_INPUT_GET, true);
-$mbox = get_input_value('_mbox', RCUBE_INPUT_GET, true);
-$filter = get_input_value('_filter', RCUBE_INPUT_GET);
-$headers = get_input_value('_headers', RCUBE_INPUT_GET);
+$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);
@@ -41,107 +45,151 @@
$_SESSION['search_filter'] = $filter;
// Check the search string for type of search
-if (preg_match("/^from:.*/i", $str))
-{
- list(,$srch) = explode(":", $str);
- $subject['from'] = "HEADER FROM";
+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);
- $subject['to'] = "HEADER TO";
+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);
- $subject['cc'] = "HEADER CC";
+else if (preg_match("/^cc:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['cc'] = "HEADER CC";
}
-else if (preg_match("/^bcc:.*/i", $str))
-{
- list(,$srch) = explode(":", $str);
- $subject['bcc'] = "HEADER BCC";
+else if (preg_match("/^bcc:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['bcc'] = "HEADER BCC";
}
-else if (preg_match("/^subject:.*/i", $str))
-{
- list(,$srch) = explode(":", $str);
- $subject['subject'] = "HEADER SUBJECT";
+else if (preg_match("/^subject:.*/i", $str)) {
+ list(,$srch) = explode(":", $str);
+ $subject['subject'] = "HEADER SUBJECT";
}
-else if (preg_match("/^body:.*/i", $str))
-{
- list(,$srch) = explode(":", $str);
- $subject['text'] = "TEXT";
+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 '.strtoupper($header);
- }
- }
+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->config->get('search_mods', $SEARCH_MODS_DEFAULT);
- $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';
- }
+ // 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 .= 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($mbox, $search_str, $imap_charset, $sort_column);
+if ($search_str) {
+ $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);
+}
// save search results in session
-if (!is_array($_SESSION['search']))
- $_SESSION['search'] = array();
+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'] = $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');
+$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', '');
+}
+
+// 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);
- if ($search_str)
- $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
+ 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();
+ $RCMAIL->display_server_error();
}
else {
- $OUTPUT->show_message('searchnomatch', 'notice');
+ $OUTPUT->show_message('searchnomatch', 'notice');
}
// 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