fixed bug #128278 - size not displayed correctly when searching

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@926 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index d0e19630c53b94256a79af4d4d0d96573e5d02b3..5e80c89cb8cfc8413fce3e81dd776c5fc42b9e30 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -18,7 +18,7 @@
 
       $counter = 0;
       do {
-          $data[$counter] = $read = fgets ($imap_stream, 4096);
+          $data[$counter] = $read = fgets ($imap_stream, 9096);
           if ($imap_general_debug) { echo "<small><tt><font color=cc0000>$read</font></tt></small><br>"; flush(); }
           $counter++;
       } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs));

diff --git a/functions/imap_search.php b/functions/imap_search.php
index d765c65f31c627260a52e56d3d87ce3401988c94..d980bd1954bab1278c9e7d701e67fbd7d9a29a6e 100644 (file)
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -63,14 +63,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]);
       }
 
@@ -87,8 +88,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])) {