Changeset 3922

Timestamp:

03/28/11 15:05:38 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #1695 - E-mail com corpo em multpart tem visualização repetida.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (4 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -958 +958 @@
                         $content = '';
                         $has_multipart = true;
+                        $is_alternative = false;
                         $this->has_cid = false;
+                        $alternative_content;
                         array_shift($return['signature']);
                         if (strtolower($msg->structure[$msg_number]->subtype) == "related")
@@ -964 +966 @@
 
                         if (strtolower($msg->structure[$msg_number]->subtype) == "alternative") {
+                                $is_alternative = true;
                                 $show_only_html = false;
                                 foreach($msg->pid[$msg_number] as $values => $msg_part) {
@@ -1011 +1014 @@
                                         else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < $max_size*3)
                                         {
-                                                $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);
-                                                $show_only_html = true;
+                                            if ($is_alternative)
+                                            {
+                                                $alternative_content = $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);
+                                            }
+                                            else
+                                                {
+                                                    $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);
+                                                    $show_only_html = true;
+                                                }
                                         }
                                 }
@@ -1091 +1101 @@
                                 }
                         }
+                        if ($is_alternative && !empty($alternative_content))
+                        {
+                            $content .= $alternative_content;
+                        }
                         if($file_type == "text/plain" && ($show_only_html &&  $msg_part == 1) ||  (!$show_only_html &&  $msg_part == 3)){
                                 if(strtolower($msg->structure[$msg_number]->subtype) == "mixed" &&  $msg_part == 1)