From 4ccd80f8bf6138ca14e89f5a65b1af401d7b6358 Mon Sep 17 00:00:00 2001
From: gustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 29 Feb 2000 11:52:15 +0000
Subject: [PATCH] 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
---
 functions/imap_messages.php | 7 ++++---
 functions/mime.php          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 6fb89d9d..851b91e3 100755
--- 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["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;
    }
 
@@ -271,7 +271,7 @@
    /******************************************************************************
     **  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);
        
@@ -285,6 +285,7 @@
          $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 e2cac359..2ff5d656 100644
--- 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
     **/
-   function decodeMime($body, $bound, $type0, $type1, &$entities) {
+   function decodeMime($body, $bound, $type0, $type1, $encoding, &$entities) {
       if ($type0 == "multipart") {
          $bound = trim($bound);
          $i = 0;
-- 
2.25.1