X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_search.php;h=d6ea4cb01d4d3ef773840c4f5e52e05619bd1781;hp=3759a45a9d6a2b238a3306d8b343690d71993c43;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hpb=e5837601c28172b0a44f8fa6099584b6dbc8cf61

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 3759a45a..d6ea4cb0 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,174 +1,125 @@
-<?php     
-/******************************************************************
- ** IMAP SEARCH ROUTIES
- *****************************************************************/
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($date_php))
-      include("../functions/date.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($mailbox_display_php))
-      include("../functions/mailbox_display.php");
-   if (!isset($mime_php))
-      include("../functions/mime.php");
-
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
-	global $msgs;
-	$urlMailbox = urlencode($mailbox);
-# Construct the Search QuERY
-	$ss = "a001 SEARCH ALL $search_where \"$search_what\"\r\n";
-	fputs($imapConnection,$ss);
-
-#Read Data Back From IMAP
-	$readin = sqimap_read_data ($imapConnection, "a001", true, $result, $message);
-	unset($messagelist); $msgs=""; $c = 0;
-#Keep going till we find the SEARCH responce
-	while ($c < count($readin)) {
-#Check to see if a SEARCH Responce was recived
-		if (substr($readin[$c],0,9) == "* SEARCH ")
-			$messagelist = explode(" ",substr($readin[$c],9));
-		else
-			$errors = $errors.$readin[$c];
-		$c++;
-	}
-#If nothing is found * SEARCH should be the first error else echo errors
-	if (strstr($errors,"* SEARCH")) {
-		echo "<br><CENTER>No Messages Found</CENTER>";
-		return;
-	} else {
-		echo "<!-- ".$errors." -->";
-	}
-echo "<br>";
-#HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify exsitising code with a search true/false varible.
-
-                global $sent_folder;
-
-            for ($q = 0; $q < count($messagelist); $q++) {
-			$messagelist[$q] = trim($messagelist[$q]);
-                                        if ($mailbox == $sent_folder)
-                        $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], true);
-                                        else
-                        $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], false);
-                                        $from[$q] = $hdr->from;
-                                        $date[$q] = $hdr->date;
-                                        $subject[$q] = $hdr->subject;
-					$id[$q] = $messagelist[$q];
-
-               $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
+<?php
+
+/**
+ * imap_search.php
+ *
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP search routines
+ *
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage imap
+ * @deprecated This search interface has been largely replaced by asearch
+ */
+
+/**
+ * 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 does 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') {
+        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');
             }
-
-         $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]["SUBJECT"] = decodeHeader($subject[$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++;
-         }
-
-         /** Find and remove the ones that are deleted */
-         $i = 0;
-         $j = 0;
-         while ($j < count($messagelist)) {
-            if ($messages[$j]["FLAG_DELETED"] == true) {
-               $j++;
-               continue;
+            $search_string .= $search_where . ' ' .$multi_search_part . ' ';
+        }
+    }
+    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');
             }
-            $msgs[$i] = $messages[$j];
-
-            $i++;
-            $j++;
-         }
-         $numMessages = $i;
-
- // There's gotta be messages in the array for it to sort them.
-
-# Carn't Use the Display messages function it assumes messages are in order.
-# Again More code Hacked from else where
-
-# AT THE MOMENT YOU CARN'T SORT SEARCH RESULTS
-
-# ACTULLY THE CODE IS PROLLY BROKEN ANY HOW!
-
-	if (count($messagelist) > 0) {
-	$j=0;
-echo "<CENTER>"._("Found")." ".count($messagelist)." "._("Messages")."</CENTER>\n";
-echo "<br>\n";
-echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0>";
-      echo "<TR><TD BGCOLOR=\"$color[0]\">";
-
-      echo "\n\n\n<FORM name=messageList method=post action=\"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=0\">";
-      echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
-      echo "   <TR>\n";
-      echo "      <TD WIDTH=60% ALIGN=LEFT>\n";
-      echo "         <NOBR><SMALL>". _("Move selected to:") ."</SMALL>";
-      echo "         <TT><SMALL><SELECT NAME=\"targetMailbox\">";
-
-      $boxes = sqimap_mailbox_list($imapConnection);
-      for ($i = 0; $i < count($boxes); $i++) {
-         if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") {
-            $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
-      }
-      echo "         </SELECT></SMALL></TT>";
-      echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";
-
-      echo "      </TD>\n";
-      echo "      <TD WIDTH=40% ALIGN=RIGHT>\n";
-      echo "         <NOBR><SMALL><INPUT TYPE=SUBMIT VALUE=\"". _("Delete") ."\">&nbsp;". _("checked messages") ."</SMALL></NOBR>\n";
-      echo "      </TD>";
-      echo "   </TR>\n";
-
-      echo "</TABLE>\n\n\n";
-      echo "</TD></TR>";
-echo "<TR><TD BGCOLOR=\"$color[0]\">";
-      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[4]\">";
-      echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
-      echo "   <TD WIDTH=1%><B>&nbsp;</B></TD>";
-      /** FROM HEADER **/
-      if ($mailbox == $sent_folder)
-         echo "   <TD WIDTH=30%><B>". _("To") ."</B></td>";
-      else
-         echo "   <TD WIDTH=30%><B>". _("From") ."</B></td>";
-      /** DATE HEADER **/
-      echo "   <TD nowrap WIDTH=1%><B>". _("Date") ."</B></td>";
-		echo "   <TD WIDTH=1%>&nbsp;</TD>\n";
-      /** SUBJECT HEADER **/
-      echo "   <TD WIDTH=%><B>". _("Subject") ."</B></td>\n";
-      echo "</TR>";
- 	
-while ($j < count($msgs)) {
-		printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0);
-		//echo $msgs[$j]["SUBJECT"]."<br>";
-		$j++;
- 	}
-echo "</table>";
-echo "</tr></td></table>";
-	}
+            $search_string .= $search_where . ' {' . strlen($multi_search_part)
+                . "}\r\n" . $multi_search_part . ' ';
+        }
+    }
+
+    $search_string = trim($search_string);
+
+    /* 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";
+    }
+
+    /* read data back from IMAP */
+    $readin = sqimap_run_command($imapConnection, $ss, false, $result, $message, TRUE);
+
+    /* 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);
+
+    /* 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;
+        }
+    }
+
+    /* 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) .' -->';
+    }
+
+
+    global $sent_folder;
+
+    $cnt = count($messagelist);
+    for ($q = 0; $q < $cnt; $q++) {
+        $id[$q] = trim($messagelist[$q]);
+    }
+
+    $msgs = fillMessageArray($imapConnection,$id,$cnt);
+
+    return $msgs;
 }
 
-?>
+
+
+?>
\ No newline at end of file