X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fsearch.inc;h=e6fb629ab8c02133c398a18a5ed41bf14819326c;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=517ef3008e666eb9dfa4660d0544ad3b84e5b703;hpb=0af63e79917234f76cfa7ec74e9d97b24fbf9b55;p=roundcube.git

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 517ef30..e6fb629 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -11,97 +11,137 @@
  |         Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
+ $Id: search.inc 5527 2011-12-02 09:58:03Z alec $
+
 */
 
 $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 encoded query string
+$imap_charset = RCMAIL_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     = 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);
+$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)) {
+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['from'] = "HEADER FROM";
 }
-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['to'] = "HEADER TO";
 }
-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['cc'] = "HEADER CC";
 }
-else if (preg_match("/^subject:/i", $str)) {
+else if (preg_match("/^bcc:.*/i", $str))
+{
   list(,$srch) = explode(":", $str);
-  $search = $IMAP->search($mbox, "HEADER SUBJECT", trim($srch), $imap_charset);
-  finish_search($mbox, $search);
+  $subject['bcc'] = "HEADER BCC";
 }
-else if (preg_match("/^body:/i", $str)) {
+else if (preg_match("/^subject:.*/i", $str))
+{
   list(,$srch) = explode(":", $str);
-  $search = $IMAP->search($mbox, "TEXT", trim($srch), $imap_charset);
-  finish_search($mbox, $search);
+  $subject['subject'] = "HEADER SUBJECT";
 }
-// 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 if (preg_match("/^body:.*/i", $str))
+{
+  list(,$srch) = explode(":", $str);
+  $subject['text'] = "TEXT";
 }
-
-
-// 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 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
-    {
-    $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);
+
+    // 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 = isset($srch) ? trim($srch) : trim($str);
+
+if (!empty($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)
+  $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'] = $IMAP->get_search_set();
+  $_SESSION['last_text_search'] = $str;
+}
+$_SESSION['search_request'] = $search_request;
+
+// 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')));
+}
+// handle IMAP errors (e.g. #1486905)
+else  if ($err_code = $IMAP->get_error_code()) {
+  rcmail_display_server_error();
+}
+else {
+  $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/$IMAP->page_size));
+$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
+$OUTPUT->send();
+
 
-?>
\ No newline at end of file