Added IMAP speed imrpovements from the guys at XS4ALL

[squirrelmail.git] / functions / imap_search.php

diff --git a/functions/imap_search.php b/functions/imap_search.php
index c9d0ddb00f39ac0461337c0e99af7faf8fed0d9c..d1ea2020b4861705ee4d56f64995e4c24d1cfaaf 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,19 +1,19 @@
-<?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");
-
-   $imap_search_php = true;
+<?php 
+   /******************************************************************
+    ** IMAP SEARCH ROUTIES
+    ** $Id$
+    *****************************************************************/
+    
+   if (defined ('imap_search_php'))
+      return;
+   define ('imap_search_php', true);
+   
+   include("../functions/imap.php");
+   include("../functions/date.php");
+   include("../functions/array.php");
+   include("../functions/mailbox_display.php");
+   include("../functions/mime.php");
+
 
 function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
    global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
@@ -21,7 +21,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
    
    # Construct the Search QuERY
    
-   if ($languages[$squirrelmail_language]["CHARSET"]) {
+   if (isset($languages[$squirrelmail_language]["CHARSET"]) && $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";
@@ -29,7 +29,12 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
    fputs($imapConnection,$ss);
 
    # Read Data Back From IMAP
-   $readin = sqimap_read_data ($imapConnection, "a001", true, $result, $message);
+   $readin = sqimap_read_data ($imapConnection, "a001", false, $result, $message);
+   if (isset($languages[$squirrelmail_language]["CHARSET"]) && strtolower($result) == "no") { 
+      $ss = "a001 SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
+      fputs ($imapConnection, $ss);
+      $readin = sqimap_read_data ($imapConnection, "a001", true, $result, $message);
+   }
    unset($messagelist); $msgs=""; $c = 0;
 
    #Keep going till we find the SEARCH responce
@@ -38,44 +43,46 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
       #Check to see if a SEARCH Responce was recived
       if (substr($readin[$c],0,9) == "* SEARCH ")
          $messagelist = explode(" ",substr($readin[$c],9));
-      else
+      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 (strstr($errors,"* SEARCH")) {
+   if (isset($errors) && strstr($errors,"* SEARCH")) {
       echo "<br><CENTER>No Messages Found</CENTER>";
       return;
-   } else {
+   } 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++) {
-      $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;
-         $id[$q] = $messagelist[$q];
-
-         $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
-      }
-
-      $j = 0;
-      while ($j < count($messagelist)) {
-         $date[$j] = ereg_replace("  ", " ", $date[$j]);
+      $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, $issnet);
+   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);
@@ -86,8 +93,10 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
          $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]["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])) {
@@ -106,13 +115,13 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
             $num++;
          }
          $j++;
-      }
+   }
 
       /** Find and remove the ones that are deleted */
       $i = 0;
       $j = 0;
       while ($j < count($messagelist)) {
-         if ($messages[$j]["FLAG_DELETED"] == true) {
+         if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
             $j++;
             continue;
          }
@@ -127,6 +136,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 
       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),
              '', -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',