sent shows "to" instead of "from"

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 76b5cee3941c32d88e9453c224cc9fdbb09ca0f4..cdd240a82b6642fd3d652a5b6a946ac9de4df69b 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  imap_messages.php
     **
@@ -9,7 +9,7 @@
     **  Copies specified messages to specified folder
     ******************************************************************************/
    function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
-      fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
    }
 
@@ -31,21 +31,31 @@
     **  Sets the specified messages with specified flag
     ******************************************************************************/
    function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
-      fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\n");
+      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 BODY[HEADER.FIELDS (From Subject Date)]\n");
+   function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date, $sent) {
+      //fputs ($imap_stream, "a001 FETCH $id BODY[HEADER.FIELDS (DATE FROM SUBJECT)]\r\n");
+      fputs ($imap_stream, "a001 FETCH $id RFC822.HEADER\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
+      $subject = _("(no subject)");
+      $from = _("Unknown Sender");
       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 ($sent == true) {
+                if (strtolower(substr($read[$i], 0, 3)) == "to:")
+                $from = sqimap_find_displayable_name(substr($read[$i], 3));
+                       } else {
+                if (strtolower(substr($read[$i], 0, 5)) == "from:")
+                $from = sqimap_find_displayable_name(substr($read[$i], 5));
+                       }
+
+                       if (strtolower(substr($read[$i], 0, 5)) == "date:") {
             $date = substr($read[$i], 5);
          } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
             $subject = htmlspecialchars(substr($read[$i], 8));
@@ -58,22 +68,18 @@
    /******************************************************************************
     **  Returns the flags for the specified messages 
     ******************************************************************************/
-   function sqimap_get_flags ($imap_stream, $start, $end) {
-      fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\n");
+   function sqimap_get_flags ($imap_stream, $i) {
+      fputs ($imap_stream, "a001 FETCH $i:$i FLAGS\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      $i = 0;
-      while ($i < count($read)) {
-         if (strpos($read[$i], "FLAGS")) {
-            $tmp = ereg_replace("\(", "", $read[$i]);
-            $tmp = ereg_replace("\)", "", $tmp);
-            $tmp = str_replace("\\", "", $tmp);
-            $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
-            $tmp = trim($tmp);
-            $flags[$i] = explode(" ", $tmp);
-         } else {
-            $flags[$i][0] = "None";
-         }
-         $i++;
+      if (strpos($read[0], "FLAGS")) {
+         $tmp = ereg_replace("\(", "", $read[0]);
+         $tmp = ereg_replace("\)", "", $tmp);
+         $tmp = str_replace("\\", "", $tmp);
+         $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
+         $tmp = trim($tmp);
+         $flags = explode(" ", $tmp);
+      } else {
+         $flags[0] = "None";
       }
       return $flags;
    }
@@ -86,7 +92,7 @@
       $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["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;
    }
 
@@ -94,7 +100,7 @@
     **  Wrapper function that reformats the header information.
     ******************************************************************************/
    function sqimap_get_message_header ($imap_stream, $id) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n");
+      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); 
@@ -160,16 +166,8 @@
             }
 
             /** Detect the boundary of a multipart message **/
-            if (strpos(strtolower(trim($line)), "boundary=")) {
-               $pos = strpos(strtolower($line), "boundary=") + 9;
-               $bound = trim($line);
-               if (strpos($line, " ", $pos) > 0) {
-                  $bound = substr($bound, $pos, strpos($line, " ", $pos));
-               } else {
-                  $bound = substr($bound, $pos);
-               }
-               $bound = str_replace("\"", "", $bound);
-               $header["BOUNDARY"] = $bound;
+            if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {                             
+               $header["BOUNDARY"] = $regs[1];                                             
             }
 
             /** Detect the charset **/
@@ -187,9 +185,23 @@
                $header["CHARSET"] = "us-ascii";
             }
 
+         }
+
+         else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {   
+            /** Add better dontent-disposition support **/
+            
+            $line = $read[$i];
+            $i++;
+            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
+               str_replace("\n", "", $line);
+               str_replace("\n", "", $read[$i]);
+               $line = "$line $read[$i]";
+               $i++;
+            }
+
             /** Detects filename if any **/
-            if (strpos(strtolower(trim($line)), "name=")) {
-               $pos = strpos($line, "name=") + 5;
+            if (strpos(strtolower(trim($line)), "filename=")) {
+               $pos = strpos($line, "filename=") + 9;
                $name = trim($line);
                if (strpos($line, " ", $pos) > 0) {
                   $name = substr($name, $pos, strpos($line, " ", $pos));
@@ -282,8 +294,8 @@
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/
-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
+   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);
        
       $i = 0;
@@ -297,6 +309,6 @@
       }
       $body = $bodytmp;
 
-      return decodeMime($body, $bound, $type0, $type1, $encoding);
+      return decodeMime($body, $bound, $type0, $type1, $encoding, $charset);
    }
 ?>