X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fimap_search.php;h=300beaad57617bd3fa4601b5b971ade955e11fd3;hb=a615e36190f51e5c4705e80b77fe29404ea37478;hp=7d497ab49360bd033f9f61a4c94e73242cf6dfe9;hpb=245a6892bf5c780904ef9677f24d624ea17e0749;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 7d497ab4..300beaad 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,150 +1,175 @@
-<?php 
-/******************************************************************
- ** IMAP SEARCH ROUTIES
- ** $Id$
- *****************************************************************/
-   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");
-
-   $imap_search_php = true;
-
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
-   global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
-   $urlMailbox = urlencode($mailbox);
-   
-   # Construct the Search QuERY
-   
-   if ($languages[$squirrelmail_language]["CHARSET"]) {
-      $ss = "a001 SEARCH CHARSET ".$languages[$squirrelmail_language]["CHARSET"]." ALL $search_where \"$search_what\"\r\n";
-   } else {
-      $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." -->";
-   }
-
-   # 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;
-         $to[$q] = $hdr->to;
-         $priority[$q] = $hdr->priority;
-         $cc[$q] = $hdr->cc;
-		 $size[$q] = $hdr->size;
-		 $type[$q] = $hdr->type0;
-         $id[$q] = $messagelist[$q];
-         $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
-      }
-
-      $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;
+<?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$
+ */
+
+/*****************************************************************/
+/*** 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";
+        }
+        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);
+        }
+
+        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")) {
+            echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
+            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] = 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++;
+        }
+
+        /** 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;
             }
-            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;
-         }
-         $msgs[$i] = $messages[$j];
-
-         $i++;
-         $j++;
-      }
-      $numMessages = $i;
-
-      // There's gotta be messages in the array for it to sort them.
-
-      if (count($messagelist) > 0) {
-         $j=0;
-         mail_message_listing_beginning($imapConnection, 
-            "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what),
-             '', -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
-             '&nbsp;');
-         
- 
-         while ($j < count($msgs)) {
-            printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
+            $msgs[$i] = $messages[$j];
+
+            $i++;
             $j++;
-         }
-         echo "</table>";
-         echo "</tr></td></table>";
-      }
-   }
+        }
+        $numMessages = $i;
+
+        // There's gotta be messages in the array for it to sort them.
+
+        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;');
+
+
+            while ($j < count($msgs)) {
+                printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
+                $j++;
+            }
+            echo '</table></tr></td></table>';
+        }
+    }
 
 ?>