Changeset 2740

Timestamp:

05/07/10 16:54:07 (14 years ago)

Author:

niltonneto

Message:

Ticket #1066 - Correção de problema durante leitura de mensagem sem multipart.

File:

• branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

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

@@ -708 +708 @@
                                         return $return;
                         }
-
-                        $content = $this->decodeBody(
-                                imap_body( $this -> mbox, $msg_number, FT_UID ),
-                                $msg -> encoding[ $msg_number ][ 0 ],
-                                $msg -> charset[ $msg_number ][ 0 ]
-                        );
-
-                        if ( strtolower( $msg -> structure[ $msg_number ] -> subtype ) == 'plain' )
-                        {
-                                $content = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $content );
-                                $content = nl2br( htmlentities( $content ) );
-                                $content = $this -> replace_links( $content );
-                                $content = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $content );
-                                $content = '<span style="font-family: monospace">' . $content . '</span>';
-
-                                $return[ 'body' ] = $content;
-
-                                return $return;
+                        $content = '';
+                        // If simple message is subtype 'html' or 'plain', then get content body.
+                        if(strtolower($msg->structure[$msg_number]->subtype) == "html" || 
+                                strtolower( $msg -> structure[ $msg_number ] -> subtype ) == 'plain'){
+
+                                $content = $this->decodeBody(
+                                        imap_body( $this -> mbox, $msg_number, FT_UID ),
+                                        $msg -> encoding[ $msg_number ][ 0 ],
+                                        $msg -> charset[ $msg_number ][ 0 ]
+                                );
+
+                                if ( strtolower( $msg -> structure[ $msg_number ] -> subtype ) == 'plain' )
+                                {
+                                        $content = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $content );
+                                        $content = nl2br( htmlentities( $content ) );
+                                        $content = $this -> replace_links( $content );
+                                        $content = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $content );
+                                        $content = '<span style="font-family: monospace">' . $content . '</span>';
+
+                                        $return[ 'body' ] = $content;
+
+                                        return $return;
+                                }
                         }
                 }