Fixed bug: Encoding was not set correctly when message was not multipart.

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 6fb89d9de1f75cacb6b31a58a5b8e77aa5546bab..851b91e3f078cf3637b6b1a8341681ffd9521e62 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -88,7 +88,7 @@
       $message["INFO"]["ID"] = $id;
       $message["INFO"]["MAILBOX"] = $mailbox;
       $message["HEADER"] = sqimap_get_message_header($imap_stream, $id);
       $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"]);

       return $message;
    }
 
       return $message;
    }
 


@@ -271,7 +271,7 @@
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/

-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1) {
+   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {

       fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
        
       fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
        


@@ -285,6 +285,7 @@
          $i++;
       }
       $body = $bodytmp;
          $i++;
       }
       $body = $bodytmp;

-      return decodeMime($body, $bound, $type0, $type1);
+
+      return decodeMime($body, $bound, $type0, $type1, $encoding);

    }
 ?>
    }
 ?>

diff --git a/functions/mime.php b/functions/mime.php
index e2cac35923136d5577e887e58a80567cbaac6957..2ff5d656e4ba2178b79260f4e2996512f7307879 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -11,7 +11,7 @@
    /** This is the first function called.  It decides if this is a multipart
        message or if it should be handled as a single entity
     **/
    /** This is the first function called.  It decides if this is a multipart
        message or if it should be handled as a single entity
     **/

-   function decodeMime($body, $bound, $type0, $type1, &$entities) {
+   function decodeMime($body, $bound, $type0, $type1, $encoding, &$entities) {

       if ($type0 == "multipart") {
          $bound = trim($bound);
          $i = 0;
       if ($type0 == "multipart") {
          $bound = trim($bound);
          $i = 0;