X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=e3e23b2b4cdb180e82002aed4e458d8e32a9f2ed;hb=e4a256af2e1a80cddbbbd200ed68f7ea43c89a60;hp=a7ac66e62873f28d981d5efa5baf3661655f7c05;hpb=5917742752bea11a547aeba6e4102dd3655b4800;p=squirrelmail.git

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index a7ac66e6..e3e23b2b 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -5,6 +5,8 @@
     **  This implements functions that manipulate messages 
     **/
 
+   if (!$mime_php) include "../functions/mime.php";
+
    /******************************************************************************
     **  Copies specified messages to specified folder
     ******************************************************************************/
@@ -33,29 +35,61 @@
    function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
       fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      
    }
 
    /******************************************************************************
     **  Returns some general header information -- FROM, DATE, and SUBJECT
     ******************************************************************************/
-   function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
-      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER.LINES (From Subject Date)\r\n");
+   class small_header {
+      var $from, $subject, $date, $to, $priority, $message_id;
+   }
+	 
+   function sqimap_get_small_header ($imap_stream, $id, $sent) {
+      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)");
       $from = _("Unknown Sender");
+      $priority = "0";
+      $messageid = "<>";
+
+      $g = 0;
       for ($i = 0; $i < count($read); $i++) {
-         if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $from = sqimap_find_displayable_name(substr($read[$i], 5));
-         } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
+         if (eregi ("^to:", $read[$i])) {
+            //$to = sqimap_find_displayable_name(substr($read[$i], 3));
+            $to = substr($read[$i], 3);
+	      } else if (eregi ("^from:", $read[$i])) {
+            //$from = sqimap_find_displayable_name(substr($read[$i], 5));
+            $from = substr($read[$i], 5);
+	      } else if (eregi ("^x-priority:", $read[$i])) {
+            $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 (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $subject = htmlspecialchars(substr($read[$i], 8));
-            if (strlen(trim($subject)) == 0)
+         } else if (eregi ("^subject:", $read[$i])) {
+            $subject = htmlspecialchars(eregi_replace ("^subject: ", "", $read[$i]));
+            if (trim($subject) == "")
                $subject = _("(no subject)");
          }
       }
+
+      $header = new small_header;
+      if ($sent == true)
+         $header->from = $to;
+      else   
+         $header->from = $from;
+
+      $header->date = $date;
+      $header->subject = $subject;
+      $header->to = $to;
+      $header->priority = $priority;
+      $header->message_id = $messageid;
+      $header->cc = $cc;
+
+      return $header;
    }
 
    /******************************************************************************
@@ -82,26 +116,29 @@
     **  the documentation folder for more information about this array.
     ******************************************************************************/
    function sqimap_get_message ($imap_stream, $id, $mailbox) {
-      $message["INFO"]["ID"] = $id;
-      $message["INFO"]["MAILBOX"] = $mailbox;
-      $message["HEADER"] = sqimap_get_message_header($imap_stream, $id);
-      $message["ENTITIES"] = sqimap_get_message_body($imap_stream, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"], $message["HEADER"]["ENCODING"], $message["HEADER"]["CHARSET"]);
-      return $message;
+      $header = sqimap_get_message_header($imap_stream, $id, $mailbox);
+      $msg = sqimap_get_message_body($imap_stream, &$header);
+      return $msg;
    }
 
    /******************************************************************************
     **  Wrapper function that reformats the header information.
     ******************************************************************************/
-   function sqimap_get_message_header ($imap_stream, $id) {
+   function sqimap_get_message_header ($imap_stream, $id, $mailbox) {
       fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
      
-      return sqimap_get_header($imap_stream, $read); 
+      $header = sqimap_get_header($imap_stream, $read); 
+      $header->id = $id;
+      $header->mailbox = $mailbox;
+
+      return $header;
    }
 
    /******************************************************************************
     **  Wrapper function that returns entity headers for use by decodeMime
     ******************************************************************************/
+    /*
    function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
       $header = sqimap_get_header($imap_stream, $read);
       $type0 = $header["TYPE0"]; 
@@ -111,26 +148,28 @@
       $charset = $header["CHARSET"];
       $filename = $header["FILENAME"];
    }
+    */
 
    /******************************************************************************
     **  Queries the IMAP server and gets all header information.
     ******************************************************************************/
    function sqimap_get_header ($imap_stream, $read) {
+      $hdr = new msg_header();
       $i = 0;
       // Set up some defaults
-      $header["TYPE0"] = "text";
-      $header["TYPE1"] = "plain";
-      $header["CHARSET"] = "us-ascii";
+      $hdr->type0 = "text";
+      $hdr->type1 = "plain";
+      $hdr->charset = "us-ascii";
 
       while ($i < count($read)) {
          if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
-            $header["MIME"] = true;
+            $hdr->mime = true;
             $i++;
          }
 
          /** ENCODING TYPE **/
          else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") {
-            $header["ENCODING"] = strtolower(trim(substr($read[$i], 26)));
+            $hdr->encoding = strtolower(trim(substr($read[$i], 26)));
             $i++;
          }
 
@@ -142,10 +181,10 @@
 
 
             if (strpos($cont, "/")) {
-               $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
-               $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
+               $hdr->type0 = substr($cont, 0, strpos($cont, "/"));
+               $hdr->type1 = substr($cont, strpos($cont, "/")+1);
             } else {
-               $header["TYPE0"] = $cont;
+               $hdr->type0 = $cont;
             }
 
 
@@ -160,7 +199,7 @@
 
             /** Detect the boundary of a multipart message **/
             if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {                             
-               $header["BOUNDARY"] = $regs[1];                                             
+               $hdr->boundary = $regs[1];                                             
             }
 
             /** Detect the charset **/
@@ -173,9 +212,9 @@
                   $charset = substr($charset, $pos);
                }
                $charset = str_replace("\"", "", $charset);
-               $header["CHARSET"] = $charset;
+               $hdr->charset = $charset;
             } else {
-               $header["CHARSET"] = "us-ascii";
+               $hdr->charset = "us-ascii";
             }
 
          }
@@ -202,21 +241,21 @@
                   $name = substr($name, $pos);
                }
                $name = str_replace("\"", "", $name);
-               $header["FILENAME"] = $name;
+               $hdr->filename = $name;
             }
          }
 
          /** REPLY-TO **/
          else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
-            $header["REPLYTO"] = trim(substr($read[$i], 9, strlen($read[$i])));
+            $hdr->replyto = trim(substr($read[$i], 9, strlen($read[$i])));
             $i++;
          }
 
          /** FROM **/
          else if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $header["FROM"] = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
-            if ($header["REPLYTO"] == "")
-               $header["REPLYTO"] = $header["FROM"];
+            $hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
+            if ($hdr->replyto == "")
+               $hdr->replyto = $hdr->from;
             $i++;
          }
          /** DATE **/
@@ -225,83 +264,89 @@
             $d = trim($d);
             $d = ereg_replace("  ", " ", $d);
             $d = explode(" ", $d);
-            $header["DATE"] = getTimeStamp($d);
+            $hdr->date = getTimeStamp($d);
             $i++;
          }
          /** SUBJECT **/
          else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $header["SUBJECT"] = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
-            if (strlen(Chop($header["SUBJECT"])) == 0)
-               $header["SUBJECT"] = _("(no subject)");
+            $hdr->subject = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
+            if (strlen(Chop($hdr->subject)) == 0)
+               $hdr->subject = _("(no subject)");
             $i++;
          }
          /** CC **/
          else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
             $pos = 0;
-            $header["CC"][$pos] = trim(substr($read[$i], 4));
+            $hdr->cc[$pos] = trim(substr($read[$i], 4));
             $i++;
-            while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")) {
+            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
                $pos++;
-               $header["CC"][$pos] = trim($read[$i]);
+               $hdr->cc[$pos] = trim($read[$i]);
                $i++;
             }
          }
          /** TO **/
          else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
             $pos = 0;
-            $header["TO"][$pos] = trim(substr($read[$i], 4));
+            $hdr->to[$pos] = trim(substr($read[$i], 4));
             $i++;
-            while ((substr($read[$i], 0, 1) == " ")  && (trim($read[$i]) != "")){
+            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
                $pos++;
-               $header["TO"][$pos] = trim($read[$i]);
+               $hdr->to[$pos] = trim($read[$i]);
                $i++;
             }
          }
          /** MESSAGE ID **/
          else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
-            $header["MESSAGE-ID"] = trim(substr($read[$i], 11));
+            $hdr->message_id = trim(substr($read[$i], 11));
             $i++;
          }
 
 
          /** ERROR CORRECTION **/
          else if (substr($read[$i], 0, 1) == ")") {
-            if ($header["SUBJECT"] == "")
-                $header["SUBJECT"] = _("(no subject)");
+            if (strlen(trim($hdr->subject)) == 0)
+                $hdr->subject = _("(no subject)");
 
-            if ($header["FROM"] == "")
-                $header["FROM"] = _("(unknown sender)");
+            if (strlen(trim($hdr->from)) == 0)
+                $hdr->from = _("(unknown sender)");
 
-            if ($header["DATE"] == "")
-                $header["DATE"] = time();
+            if (strlen(trim($hdr->date)) == 0)
+                $hdr->date = time();
             $i++;
          }
          else {
             $i++;
          }
       }
-      return $header;
+      return $hdr;
    }
 
 
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/
-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding, $charset) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+   function sqimap_get_message_body ($imap_stream, &$header) {
+      $id = $header->id;
+      //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) {
          if ( ($i != 0) ) {
-            $bodytmp[$j] = $read[$i];
+            $body[$j] = $read[$i];
             $j++;
          }
          $i++;
       }
-      $body = $bodytmp;
-
-      return decodeMime($body, $bound, $type0, $type1, $encoding, $charset);
+      */
+      return decodeMime($imap_stream, $body, &$header);
    }
+
+
+   /******************************************************************************
+    **  Returns an array with the body structure 
+    ******************************************************************************/
 ?>