added "cc" and "body" for searching

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index c82e7a97167389419679946b56d2823cf7853368..e3e23b2b4cdb180e82002aed4e458d8e32a9f2ed 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -45,7 +45,7 @@
    }
         
    function sqimap_get_small_header ($imap_stream, $id, $sent) {
-      fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Subject Message-Id X-Priority)]\r\n");
+      fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority)]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
       $subject = _("(no subject)");
@@ -65,6 +65,8 @@
             $priority = trim(substr($read[$i], 11));
          } else if (eregi ("^message-id:", $read[$i])) {
             $messageid = trim(substr($read[$i], 11));
+         } else if (eregi ("^cc:", $read[$i])) {
+            $cc = substr($read[$i], 3);
          } else if (eregi ("^date:", $read[$i])) {
             $date = substr($read[$i], 5);
          } else if (eregi ("^subject:", $read[$i])) {
@@ -78,13 +80,14 @@
       if ($sent == true)
          $header->from = $to;
       else   
-        $header->from = $from;
+         $header->from = $from;
 
       $header->date = $date;
       $header->subject = $subject;
       $header->to = $to;
       $header->priority = $priority;
       $header->message_id = $messageid;
+      $header->cc = $cc;
 
       return $header;
    }
@@ -113,7 +116,6 @@
     **  the documentation folder for more information about this array.
     ******************************************************************************/
    function sqimap_get_message ($imap_stream, $id, $mailbox) {
-      
       $header = sqimap_get_message_header($imap_stream, $id, $mailbox);
       $msg = sqimap_get_message_body($imap_stream, &$header);
       return $msg;
@@ -329,6 +331,7 @@
       //fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
       //$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
        
+      /*
       $i = 0;
       $j = 0;
       while ($i < count($read)-1) {
@@ -338,7 +341,8 @@
          }
          $i++;
       }
-      return decodeMime($body, &$header);
+      */
+      return decodeMime($imap_stream, $body, &$header);
    }