From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/steps/mail/search.inc | 128 ++++++++++++++++++++++++++----------------
1 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index a3f6dda..1fc74df 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -11,6 +11,8 @@
| Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
+ $Id$
+
*/
$REMOTE_REQUEST = TRUE;
@@ -21,89 +23,115 @@
$_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 = RCMAIL_CHARSET;
// get search string
$str = get_input_value('_q', RCUBE_INPUT_GET);
+$filter = get_input_value('_filter', RCUBE_INPUT_GET);
$mbox = get_input_value('_mbox', RCUBE_INPUT_GET);
-$search_request = md5($mbox.$str);
+$headers = get_input_value('_headers', RCUBE_INPUT_GET);
+$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))
+if (preg_match("/^from:.*/i", $str))
{
list(,$srch) = explode(":", $str);
- $subject = "HEADER FROM";
- $search = trim($srch);
+ $subject['from'] = "HEADER FROM";
}
-else if (preg_match("/^to:/i", $str))
+else if (preg_match("/^to:.*/i", $str))
{
list(,$srch) = explode(":", $str);
- $subject = "HEADER TO";
- $search = trim($srch);
+ $subject['to'] = "HEADER TO";
}
-else if (preg_match("/^cc:/i", $str))
+else if (preg_match("/^cc:.*/i", $str))
{
list(,$srch) = explode(":", $str);
- $subject = "HEADER CC";
- $search = trim($srch);
+ $subject['cc'] = "HEADER CC";
}
-else if (preg_match("/^subject:/i", $str))
+else if (preg_match("/^bcc:.*/i", $str))
{
list(,$srch) = explode(":", $str);
- $subject = "HEADER SUBJECT";
- $search = trim($srch);
+ $subject['bcc'] = "HEADER BCC";
}
-else if (preg_match("/^body:/i", $str))
+else if (preg_match("/^subject:.*/i", $str))
{
list(,$srch) = explode(":", $str);
- $subject = "TEXT";
- $search = trim($srch);
+ $subject['subject'] = "HEADER SUBJECT";
}
-// search in subject and sender by default
-else
+else if (preg_match("/^body:.*/i", $str))
{
- $subject = array("HEADER SUBJECT", "HEADER FROM");
- $search = trim($str);
+ list(,$srch) = explode(":", $str);
+ $subject['text'] = "TEXT";
}
-
-
-// execute IMAP search
-$result = $IMAP->search($mbox, $subject, $search, $imap_charset);
-$count = 0;
-
-// Make sure our $result is legit..
-if (is_array($result) && $result[0] != '')
+else if(trim($str))
{
- // Get the headers
- $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
- $count = $IMAP->messagecount();
-
- // 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] = $IMAP->get_search_set();
- rcmail_js_message_list($result_h);
- $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+ if ($headers) {
+ foreach(explode(',', $headers) as $header)
+ switch ($header) {
+ case 'text': $subject['text'] = 'TEXT'; break;
+ default: $subject[$header] = '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';
}
}
+
+$search = $srch ? trim($srch) : trim($str);
+
+if ($subject) {
+ $search_str .= str_repeat(' OR', count($subject)-1);
+ foreach ($subject as $sub)
+ $search_str .= sprintf(" %s {%d}\r\n%s", $sub, strlen($search), $search);
+}
+
+$search_str = trim($search_str);
+
+// execute IMAP search
+if ($search_str)
+ $result = $IMAP->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']);
+
+// Get the headers
+$result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+$count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
+
+// save search results in session
+if (!is_array($_SESSION['search']))
+ $_SESSION['search'] = array();
+
+if ($search_str) {
+ $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+ $_SESSION['last_text_search'] = $str;
+}
+
+// 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' => $IMAP->messagecount(NULL, 'ALL')));
+}
else
{
- $OUTPUT->show_message('searchnomatch', 'warning');
- $search_request = -1;
+ $OUTPUT->show_message('searchnomatch', 'notice');
}
// update message count display
-$pages = ceil($count/$IMAP->page_size);
-$OUTPUT->set_env('search_request', $search_request);
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
$OUTPUT->set_env('messagecount', $count);
-$OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
$OUTPUT->send();
-?>
\ No newline at end of file
+
--
Gitblit v1.9.1