Imported Upstream version 0.1~rc1~dfsg

[roundcube.git] / program / steps / mail / search.inc

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 517ef3008e666eb9dfa4660d0544ad3b84e5b703..bef821b4072c9f43c333e71d6c64dbfe23adeef1 100644 (file)
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -15,93 +15,95 @@
 
 $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;
 
-// search query comes in with ISO encoding because javascript escape()
-// uses ISO-8859-1. Better handling for that will follow.
-$imap_charset = 'ISO-8859-1';
+// using encodeURI with javascript "should" give us
+// a correctly UTF-8 encoded query string
+$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
+{
+  $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);
+// 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] != '')
+{
+  // Get the headers
+  $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+  $count = count($result_h);
 
-    // save search results in session
-    if (!is_array($_SESSION['search']))
-      $_SESSION['search'] = array();
+  // 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);
+  // 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));
   }
+}
+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();
 
 ?>
\ No newline at end of file