X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=fbc9baeb551345657dbc1f549faa7eeff5750bbe;hb=e5f1d1ee9a85d2a271135d05f6d1300996e48aa8;hp=e7b432f4c7ec42e3043562672fdaa19a9d003a90;hpb=2ba138034e8cf69a80201035e0abdb51af93083d;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index e7b432f4..fbc9baeb 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,160 +1,209 @@
 <?php
 
-   /**
-    **  imap_search.php
-    **
-    **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  IMAP search routines
-    **
-    ** $Id$
-    **/
-
-
-    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";
-        }
-        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);
-        }
+/**
+ * imap_search.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP search routines
+ *
+ * $Id$
+ */
 
-        unset($messagelist); $msgs=""; $c = 0;
+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');
 
-        /* Keep going till we find the SEARCH responce */
-        while ($c < count( $readin )) {
+function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '', $search_all, $count_all) {
 
-            /* 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++;
-        }
+    global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
+    global $pos;
 
-        #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." -->";
-        }
+    $pos = $search_position;
 
-        # HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify
-        # exsitising code with a search true/false varible.
+    $urlMailbox = urlencode($mailbox);
 
+    /* Construct the Search QuERY */
 
-        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;
-        }
+#  account for multiple search terms
 
-        $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++;
+        $multi_search = array ();
+        $search_what = ereg_replace("[ ]{2,}", ' ', $search_what);
+        $multi_search = split (' ', $search_what);
+        if (count($multi_search)==1) {
+                $search_string = $search_where . ' ' . '"' . $multi_search[0] . '"';
+        }
+        else {
+                $search_string = '';
+        $count = count($multi_search);
+                for ($x=0;$x<$count;$x++) {
+                	$search_string = $search_string . ' ' . $search_where . " " . '"' . $multi_search[$x] . '" ';
                 }
-                $j++;
         }
+	$search_string = trim($search_string);
 
-        /** 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;
+# now use $search_string in the imap search
+
+    if (isset($languages[$squirrelmail_language]['CHARSET']) &&
+        $languages[$squirrelmail_language]['CHARSET']) {
+        $ss = "SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_string";
+    } else {
+        $ss .= "SEARCH ALL $search_string\"";
+    }
+
+    /* Read Data Back From IMAP */
+    $readin = sqimap_run_command ($imapConnection, $ss, true, $result, $message);
+    if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
+        // $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"";
+        $ss = "SEARCH CHARSET \"US-ASCII\" ALL $search_string";
+        $readin = sqimap_run_command ($imapConnection, $ss, 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 if (isset($errors))
+            $errors = $errors.$readin[$c];
+        else
+            $errors = $readin[$c];
+        $c++;
+    }
+
+    /* If nothing is found * SEARCH should be the first error else echo errors */
+    if (isset($errors) && strstr($errors,"* SEARCH")) {
+		if ($search_all != "all") {
+        echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
+        return;
+		}
+		else {
+        return;
+		}
+    }
+//	else if ($search_all == 'all') {
+//		return;
+//	}
+	else if (isset($errors)) {
+        echo "<!-- ".$errors." -->";
+    }
+
+    /*
+        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++) {
+        $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;
+    }
+
+    $j = 0;
+    while ($j < count($messagelist)) {
+            $date[$j] = str_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++;
             }
-            $msgs[$i] = $messages[$j];
+            $j++;
+    }
 
-            $i++;
+    /* 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;
         }
-        $numMessages = $i;
-
-        // There's gotta be messages in the array for it to sort them.
+        $msgs[$i] = $messages[$j];
 
-        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;');
+        $i++;
+        $j++;
+    }
+    $numMessages = $i;
 
+    /* There's gotta be messages in the array for it to sort them. */
 
-            while ($j < count($msgs)) {
-                printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
-                $j++;
-            }
-            echo '</table></tr></td></table>';
+    if (count($messagelist) > 0) {
+        $j=0;
+        if (!isset ($msg)) { 
+            $msg = ''; 
+        }
+        if ($search_all != 'all') {
+	    if ( !isset( $start_msg ) ) {
+	        $start_msg =0;
+	    }
+	    if ( !isset( $sort ) ) {
+                $sort = 0;
+	    }
+            mail_message_listing_beginning( $imapConnection,
+                "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+            $mailbox,
+                -1,
+                '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>'.
+            get_selectall_link($start_msg, $sort));
+        }
+        else {
+            mail_message_listing_beginning( $imapConnection,
+                "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+            $mailbox,
+                -1,
+                '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b></tr><tr>');
+        }
+		echo "<b><big><center>$mailbox</center></big></b>";
+        while ($j < count($msgs)) {
+            printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
+            $j++;
+			echo '</td></tr>';
         }
+        echo '</table></td></tr></table></form>';
+		$count_all = count($msgs);
     }
+		return $count_all;
+}
 
-?>
\ No newline at end of file
+?>