X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=57bc8fe3c6472fd50149acdaccff6cd1102aa638;hp=dbbdcce13401148598d87ff48e1cc1995335326c;hb=e5b8fc824dfc8565c7c58e46d93f78b071af72d0;hpb=4ca45d7b7f2b2d2732a5f07b0c9af51dacf6a895

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index dbbdcce1..57bc8fe3 100755
--- a/functions/imap_messages.php
+++ b/functions/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);
    }
 
@@ -25,34 +25,33 @@
       } else {
          sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
       }
-      if ($auto_expunge == true)
-         sqimap_mailbox_expunge ($imap_stream, $mailbox);
    }
 
    /******************************************************************************
     **  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 RFC822.HEADER.LINES (From Subject Date)\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER.LINES (From Subject Date)\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
       for ($i = 0; $i < count($read); $i++) {
-         if (substr($read[$i], 0, 5) == "From:") {
+         if (strtolower(substr($read[$i], 0, 5)) == "from:") {
             $from = sqimap_find_displayable_name(substr($read[$i], 5));
-         } else if (substr($read[$i], 0, 5) == "Date:") {
+         } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
             $date = substr($read[$i], 5);
-         } else if (substr($read[$i], 0, 8) == "Subject:") {
+         } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
             $subject = htmlspecialchars(substr($read[$i], 8));
             if (strlen(trim($subject)) == 0)
-               $subject = "(no subject)";
+               $subject = _("(no subject)");
          }
       }
    }
@@ -60,7 +59,20 @@
    /******************************************************************************
     **  Returns the flags for the specified messages 
     ******************************************************************************/
-   function sqimap_get_flags () {
+   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);
+      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;
    }
 
    /******************************************************************************
@@ -71,7 +83,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["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;
    }
 
@@ -79,7 +91,7 @@
     **  Wrapper function that reformats the header information.
     ******************************************************************************/
    function sqimap_get_message_header ($imap_stream, $id) {
-      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.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); 
@@ -103,6 +115,11 @@
     ******************************************************************************/
    function sqimap_get_header ($imap_stream, $read) {
       $i = 0;
+      // Set up some defaults
+      $header["TYPE0"] = "text";
+      $header["TYPE1"] = "plain";
+      $header["CHARSET"] = "us-ascii";
+
       while ($i < count($read)) {
          if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $header["MIME"] = true;
@@ -116,11 +133,12 @@
          }
 
          /** CONTENT-TYPE **/
-         else if (substr($read[$i], 0, 13) == "Content-Type:") {
+         else if (strtolower(substr($read[$i], 0, 13)) == "content-type:") {
             $cont = strtolower(trim(substr($read[$i], 13)));
             if (strpos($cont, ";"))
                $cont = substr($cont, 0, strpos($cont, ";"));
 
+
             if (strpos($cont, "/")) {
                $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
                $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
@@ -128,6 +146,7 @@
                $header["TYPE0"] = $cont;
             }
 
+
             $line = $read[$i];
             $i++;
             while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
@@ -139,7 +158,7 @@
 
             /** Detect the boundary of a multipart message **/
             if (strpos(strtolower(trim($line)), "boundary=")) {
-               $pos = strpos($line, "boundary=") + 9;
+               $pos = strpos(strtolower($line), "boundary=") + 9;
                $bound = trim($line);
                if (strpos($line, " ", $pos) > 0) {
                   $bound = substr($bound, $pos, strpos($line, " ", $pos));
@@ -165,9 +184,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));
@@ -205,7 +238,7 @@
          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)";
+               $header["SUBJECT"] = _("(no subject)");
             $i++;
          }
          /** CC **/
@@ -230,14 +263,20 @@
                $i++;
             }
          }
+         /** MESSAGE ID **/
+         else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
+            $header["MESSAGE-ID"] = trim(substr($read[$i], 11));
+            $i++;
+         }
+
 
          /** ERROR CORRECTION **/
          else if (substr($read[$i], 0, 1) == ")") {
             if ($header["SUBJECT"] == "")
-                $header["SUBJECT"] = "(no subject)";
+                $header["SUBJECT"] = _("(no subject)");
 
             if ($header["FROM"] == "")
-                $header["FROM"] = "(unknown sender)";
+                $header["FROM"] = _("(unknown sender)");
 
             if ($header["DATE"] == "")
                 $header["DATE"] = time();
@@ -250,23 +289,25 @@
       return $header;
    }
 
+
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/
-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1) {
-      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;
       $j = 0;
-      while ($i < count($read)) {
-         if ( ($i != 0) && ($i != count($read)-1) && ($i != count($read)) ) {
+      while ($i < count($read)-1) {
+         if ( ($i != 0) ) {
             $bodytmp[$j] = $read[$i];
             $j++;
          }
          $i++;
       }
       $body = $bodytmp;
-      return decodeMime($body, $bound, $type0, $type1);
+
+      return decodeMime($body, $bound, $type0, $type1, $encoding, $charset);
    }
 ?>