Changeset 1883 for branches/2.0

Timestamp:

12/22/09 13:52:20 (14 years ago)

Author:

niltonneto

Message:

Ticket #2 - Corrigido problema na leitura de determinados emails.

Location:

branches/2.0/expressoMail1_2/inc

Files:

• class.imap_functions.inc.php (modified) (1 diff)
• class.message_components.inc.php (modified) (1 diff)

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

@@ -793 +793 @@
                                                                 $content .= "<tr><td><b>".$this->functions->getLang("TO").":</b></td><td>".$this->decode_string($obj->to[0]->mailbox."@".$obj->to[0]->host)."</td></tr>";
                                                                 $content .= !$obj->cc ? "</table><br>" :"<tr><td><b>".$this->functions->getLang("CC").":</b></td><td>".$this->decode_string($obj->cc[0]->mailbox."@".$obj->cc[0]->host)."</td></tr></table><br>";                                                               
-                                                                $ix_part =      strtolower($attachment['type']) == "delivery-status" ? 1 : 0;
-                                                                $content .= nl2br($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, ($attachment['part_in_msg']+$ix_part).".1", FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]));                                                          
+                                                                $content .= $this->decodeBody( 
+                                                                imap_fetchbody( 
+                                                                                $this->mbox, 
+                                                                                $msg_number, 
+                                                                                ( $attachment['part_in_msg'] + ( 
+                                                                                        ( strtolower( $attachment[ 'type' ] ) == 'delivery-status' ) ? 0 : 1 ) 
+                                                                                        ) . ".1", 
+                                                                                        FT_UID 
+                                                                                ), 
+                                                                                $msg->encoding[ $msg_number ][ $values ], 
+                                                                                $msg->charset[ $msg_number ][ $values ] 
+                                                                ); 
                                                                 break;                  
                                                         }

branches/2.0/expressoMail1_2/inc/class.message_components.inc.php

@@ -112 +112 @@
                     $skip_next    = ($ftype == 'message/rfc822')?        true : false;
 
-                    if ($ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative')                                 
-                    //  Por niltonneto: Mensagens do ThunderBird com format=flowed nao abrem, por isso comentado essa condicao:
-                    //  || $ftype == 'multipart/related')                    
+                    if ($ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative' || $ftype == 'multipart/related')
                     {
                         $n--;