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

diff --git a/functions/imap_search.php b/functions/imap_search.php
index c8d9777b..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");
@@ -16,12 +17,12 @@
    $imap_search_php = true;
 
 function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
-   global $msgs, $message_highlight_list, $squirrelmail_language, $languages;
+   global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
    $urlMailbox = urlencode($mailbox);
    
    # 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";
@@ -38,22 +39,25 @@ 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]);
@@ -62,14 +66,15 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
       else
          $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], false);
 						
-			$from[$q] = $hdr->from;
-			$date[$q] = $hdr->date;
-			$subject[$q] = $hdr->subject;
+         $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]);
       }
 
@@ -86,8 +91,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])) {
@@ -112,7 +119,7 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
       $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,52 +134,12 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 
       if (count($messagelist) > 0) {
          $j=0;
-         echo "<center><b>" . _("Found") . " " . count($messagelist) . " " . _("messages") . "</b></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&where=".urlencode($search_where)."&what=".urlencode($search_what)."\">";
-         echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0>\n";
-         echo "   <TR>\n";
-         echo "      <TD WIDTH=60% ALIGN=LEFT VALIGN=CENTER>\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";
-         do_hook("mailbox_form_before");
-         echo "</TD></TR>";
-         echo "<TR><TD BGCOLOR=\"$color[0]\">";
-         echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">";
-         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>";
+		 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);