X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=a9cda0660a1fc32bf1920dac85f614a88db5a80b;hb=2df6ca53f811434d052179c620da81a8a5246d2f;hp=52fba101f086fbdc5bd66ba2e3290ac00bb17d46;hpb=fc05541be35007deb5026584bf14b2d167da4df4;p=squirrelmail.git

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 52fba101..a9cda066 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,6 +1,7 @@
-<?php     
+<?php 
 /******************************************************************
  ** IMAP SEARCH ROUTIES
+ ** $Id$
  *****************************************************************/
    if (!isset($imap_php))
       include("../functions/imap.php");
@@ -13,161 +14,140 @@
    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]);
-            }
-
-         $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;
-            }
-            $msgs[$i] = $messages[$j];
+   $imap_search_php = true;
 
-            $i++;
-            $j++;
-         }
-         $numMessages = $i;
+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 (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";
+   }
+   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 if (isset($errors))
+         $errors = $errors.$readin[$c];
+      else
+         $errors = $readin[$c];
+      $c++;
+   }
 
- // There's gotta be messages in the array for it to sort them.
+   #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." -->";
+   }
 
-# Carn't Use the Display messages function it assumes messages are in order.
-# Again More code Hacked from else where
+   # HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify 
+   # exsitising code with a search true/false varible.
 
-# AT THE MOMENT YOU CARN'T SORT SEARCH RESULTS
 
-# ACTULLY THE CODE IS PROLLY BROKEN ANY HOW!
+   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]);
+      }
 
-	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]\">";
+      $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++;
+      }
 
-      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\">";
+      /** 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];
 
-      $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";
+         $i++;
+         $j++;
+      }
+      $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),
+             '', -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>";
+         echo "</tr></td></table>";
       }
-      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>";
-      else
-         echo "   <TD WIDTH=30%><B>". _("From") ."</B>";
-      /** DATE HEADER **/
-      echo "   <TD nowrap WIDTH=1%><B>". _("Date") ."</B>";
-		echo "   <TD WIDTH=1%>&nbsp;</TD>\n";
-      /** SUBJECT HEADER **/
-      echo "   <TD WIDTH=%><B>". _("Subject") ."</B>\n";
-      echo "</TR>";
- 	
-while ($j < count($msgs)) {
-		printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0);
-		//echo $msgs[$j]["SUBJECT"]."<br>";
-		$j++;
- 	}
-echo "</table>";
-	}
-}
+   }
 
 ?>