X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=7794caa68438c069704fcce8683bb0e422e6f170;hb=fc380412e4affcb0ff647acbf72b0baa28699fde;hp=300beaad57617bd3fa4601b5b971ade955e11fd3;hpb=355861846a51d35efe50848869d680fd3b4a5316;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 300beaad..7794caa6 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,175 +1,123 @@
 <?php
 
 /**
- *   imap_search.php
+ * imap_search.php
  *
- *   Copyright (c) 1999-2001 The Squirrelmail Development Team
- *   Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- *   IMAP search routines
+ * IMAP search routines
  *
- *  $Id$
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage imap
+ * @deprecated This search interface has been largely replaced by asearch
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below.                              ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
-require_once('../functions/imap.php');
-require_once('../functions/date.php');
-require_once('../functions/array.php');
-require_once('../functions/mailbox_display.php');
-require_once('../functions/mime.php');
-
-
-    function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
-
-        global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
-
-        $urlMailbox = urlencode($mailbox);
-        $isid = sqimap_session_id();
-
-        /* Construct the Search QuERY */
-        $ss = $isid;
-        if (isset($languages[$squirrelmail_language]['CHARSET']) &&
-            $languages[$squirrelmail_language]['CHARSET']) {
-            $ss .= " SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_where \"$search_what\"\r\n";
-        } else {
-            $ss .= " SEARCH ALL $search_where \"$search_what\"\r\n";
+/**
+ * Load up a bunch of SM functions */
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/mailbox_display.php');
+require_once(SM_PATH . 'functions/mime.php');
+
+function sqimap_search($imapConnection, $search_where, $search_what, $mailbox,
+                       $color, $search_position = '', $search_all, $count_all) {
+
+    global $squirrelmail_language, $languages, $pos, $allow_charset_search,
+           $imap_server_type;
+
+    $pos = $search_position;
+
+    /* construct the search query, taking multiple search terms into account */
+    $multi_search = array();
+    $search_what  = trim($search_what);
+    $search_what  = ereg_replace('[ ]{2,}', ' ', $search_what);
+    $multi_search = explode(' ', $search_what);
+    $search_string = '';
+
+    /* it seems macosx and hmailserver do not support the prefered search
+       syntax so we fall back to the older style. This IMAP
+       server has a problem with multiple search terms. Instead
+       of returning the messages that match all the terms it
+       returns the messages that match each term. Could be fixed
+       on the client side, but should be fixed on the server
+       as per the RFC */
+
+    if ($imap_server_type == 'macosx' || $imap_server_type == 'hmailserver') {
+        foreach ($multi_search as $multi_search_part) {
+            if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+                $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+            }
+            $search_string .= $search_where . ' ' .$multi_search_part . ' ';
         }
-        fputs($imapConnection,$ss);
-
-        # Read Data Back From IMAP
-        $readin = sqimap_read_data ($imapConnection, $isid, false, $result, $message);
-        if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
-            $ss = $isid . " SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
-            fputs ($imapConnection, $ss);
-            $readin = sqimap_read_data ($imapConnection, $isid, true, $result, $message);
+    }
+    else {
+        foreach ($multi_search as $multi_search_part) {
+            if (strtoupper($languages[$squirrelmail_language]['CHARSET']) == 'ISO-2022-JP') {
+                $multi_search_part = mb_convert_encoding($multi_search_part, 'JIS', 'auto');
+            }
+            $search_string .= $search_where . ' {' . strlen($multi_search_part)
+                . "}\r\n" . $multi_search_part . ' ';
         }
+    }
 
-        unset($messagelist); $msgs=""; $c = 0;
-
-        /* Keep going till we find the SEARCH responce */
-        while ($c < count( $readin )) {
+    $search_string = trim($search_string);
 
-            /* Check to see if a SEARCH Responce was recived */
-            if (substr($readin[$c],0,9) == "* SEARCH ")
-                $messagelist = explode(" ",substr($readin[$c],9));
-            else if (isset($errors))
-                $errors = $errors.$readin[$c];
-            else
-                $errors = $readin[$c];
-            $c++;
-        }
+    /* now use $search_string in the imap search */
+    if ($allow_charset_search && isset($languages[$squirrelmail_language]['CHARSET']) &&
+        $languages[$squirrelmail_language]['CHARSET']) {
+        $ss = "SEARCH CHARSET "
+            . strtoupper($languages[$squirrelmail_language]['CHARSET'])
+            . " ALL $search_string";
+    } else {
+        $ss = "SEARCH ALL $search_string";
+    }
 
-        #If nothing is found * SEARCH should be the first error else echo errors
-        if (isset($errors) && strstr($errors,"* SEARCH")) {
-            echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
-            return;
-        } else if (isset($errors)) {
-            echo "<!-- ".$errors." -->";
-        }
+    /* read data back from IMAP */
+    $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, TRUE);
 
-        # HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify
-        # exsitising code with a search true/false varible.
+    /* try US-ASCII charset if search fails */
+    if (isset($languages[$squirrelmail_language]['CHARSET'])
+        && strtolower($result) == 'no') {
+        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
+        $readin = sqimap_run_command ($imapConnection, $ss, true,
+                                      $result, $message);
+    }
 
+    unset($messagelist);
 
-        global $sent_folder;
-        for ($q = 0; $q < count($messagelist); $q++) {
-            $id[$q] = trim($messagelist[$q]);
-        }
-        $issent = ($mailbox == $sent_folder);
-        $hdr_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
-        $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
-        foreach ($hdr_list as $hdr) {
-            $from[] = $hdr->from;
-            $date[] = $hdr->date;
-            $subject[] = $hdr->subject;
-            $to[] = $hdr->to;
-            $priority[] = $hdr->priority;
-            $cc[] = $hdr->cc;
-            $size[] = $hdr->size;
-            $type[] = $hdr->type0;
+    /* Keep going till we find the SEARCH response */
+    foreach ($readin as $readin_part) {
+        /* Check to see if a SEARCH response was received */
+        if (substr($readin_part, 0, 9) == '* SEARCH ') {
+            $messagelist = preg_split("/ /", substr($readin_part, 9));
+        } else if (isset($errors)) {
+            $errors = $errors.$readin_part;
+        } else {
+            $errors = $readin_part;
         }
+    }
 
-        $j = 0;
-        while ($j < count($messagelist)) {
-                $date[$j] = ereg_replace('  ', ' ', $date[$j]);
-                $tmpdate = explode(" ", trim($date[$j]));
-
-                $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
-                $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
-                $messages[$j]["ID"] = $id[$j];
-                $messages[$j]["FROM"] = decodeHeader($from[$j]);
-                $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
-                $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
-                $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j]));
-                $messages[$j]["TO"] = decodeHeader($to[$j]);
-                $messages[$j]["PRIORITY"] = $priority[$j];
-                $messages[$j]["CC"] = $cc[$j];
-                $messages[$j]["SIZE"] = $size[$j];
-                $messages[$j]["TYPE0"] = $type[$j];
-
-                $num = 0;
-                while ($num < count($flags[$j])) {
-                    if ($flags[$j][$num] == 'Deleted') {
-                        $messages[$j]['FLAG_DELETED'] = true;
-                    } else if ($flags[$j][$num] == 'Answered') {
-                        $messages[$j]['FLAG_ANSWERED'] = true;
-                    } else if ($flags[$j][$num] == 'Seen') {
-                        $messages[$j]['FLAG_SEEN'] = true;
-                    } else if ($flags[$j][$num] == 'Flagged') {
-                        $messages[$j]['FLAG_FLAGGED'] = true;
-                    }
-                    $num++;
-                }
-                $j++;
+    /* If nothing is found * SEARCH should be the first error else echo errors */
+    if (isset($errors)) {
+        if (strstr($errors,'* SEARCH')) {
+            return array();
         }
+        echo '<!-- '.htmlspecialchars($errors) .' -->';
+    }
 
-        /** Find and remove the ones that are deleted */
-        $i = 0;
-        $j = 0;
-        while ($j < count($messagelist)) {
-            if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
-                $j++;
-                continue;
-            }
-            $msgs[$i] = $messages[$j];
-
-            $i++;
-            $j++;
-        }
-        $numMessages = $i;
 
-        // There's gotta be messages in the array for it to sort them.
+    global $sent_folder;
 
-        if (count($messagelist) > 0) {
-            $j=0;
-            if (!isset ($msg)) { $msg = ""; }
-            mail_message_listing_beginning($imapConnection,
-                "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what),
-                $mailbox, -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
-                '&nbsp;');
+    $cnt = count($messagelist);
+    for ($q = 0; $q < $cnt; $q++) {
+        $id[$q] = trim($messagelist[$q]);
+    }
 
+    $msgs = fillMessageArray($imapConnection,$id,$cnt);
 
-            while ($j < count($msgs)) {
-                printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
-                $j++;
-            }
-            echo '</table></tr></td></table>';
-        }
-    }
+    return $msgs;
+}
 
-?>
+?>
\ No newline at end of file