From 7dfb1fba5001299300736e6b5d95d9400575e3e7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 14:59:02 -0400
Subject: [PATCH] Set the right number of arguments for setcookie()
---
program/steps/mail/search.inc | 128 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index e1690ee..66fcf47 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -15,8 +15,9 @@
$REMOTE_REQUEST = TRUE;
-// reset list_page
+// reset list_page and old search results
$IMAP->set_page(1);
+$IMAP->set_search_set(NULL);
$_SESSION['page'] = 1;
// using encodeURI with javascript "should" give us
@@ -24,84 +25,87 @@
$imap_charset = 'UTF-8';
// get search string
-$str = get_input_value('_search', RCUBE_INPUT_GET);
+$str = get_input_value('_q', RCUBE_INPUT_GET);
$mbox = get_input_value('_mbox', RCUBE_INPUT_GET);
-$search_request = md5($str);
+$search_request = md5($mbox.$str);
// Check the search string for type of search
-if (preg_match("/^from:/i", $str)) {
+if (preg_match("/^from:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER FROM" ,trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "HEADER FROM";
+ $search = trim($srch);
}
-else if (preg_match("/^to:/i", $str)) {
+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);
+ $subject = "HEADER TO";
+ $search = trim($srch);
}
-else if (preg_match("/^cc:/i", $str)) {
+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);
+ $subject = "HEADER CC";
+ $search = trim($srch);
}
-else if (preg_match("/^subject:/i", $str)) {
+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);
+ $subject = "HEADER SUBJECT";
+ $search = trim($srch);
}
-else if (preg_match("/^body:/i", $str)) {
+else if (preg_match("/^body:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "TEXT", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "TEXT";
+ $search = trim($srch);
}
// search in subject and sender by default
-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)));
+else
+{
+ $from = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM";
+ $subject = array("HEADER SUBJECT", "HEADER $from");
+ $search = trim($str);
}
-// 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;
- }
+// execute IMAP search
+$result = $IMAP->search($mbox, $subject, $search, $imap_charset);
+$count = 0;
- // 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);
- }
+// Make sure our $result is legit..
+if (is_array($result) && $result[0] != '')
+{
+ // Get the headers
+ $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+ $count = $IMAP->messagecount();
-?>
\ No newline at end of file
+ // 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();
+ $_SESSION['last_text_search'] = $str;
+ rcmail_js_message_list($result_h);
+ $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+ }
+}
+else
+{
+ $OUTPUT->show_message('searchnomatch', 'warning');
+ $search_request = -1;
+}
+
+// update message count display
+$pages = ceil($count/$IMAP->page_size);
+$OUTPUT->set_env('search_request', $search_request);
+$OUTPUT->set_env('messagecount', $count);
+$OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
+$OUTPUT->send();
+
+?>
--
Gitblit v1.9.1