Changeset 2057

Timestamp:

02/23/10 16:57:37 (14 years ago)

Author:

amuller

Message:

Ticket #921 - Correção de alguns anexos multipart

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -909 +909 @@
                                                                 $content .= '</table><br>';
 
-                                                                $content .= $this->decodeBody(
+
+                                                                $id = ( ( strtolower( $attachment[ 'type' ] ) == 'delivery-status' ) ? false : true );
+                                                                if ( strtolower( $msg->structure[$msg_number]->parts[1]->parts[0]->subtype ) == 'plain' )
+                                                                {
+                                                                        $id = !$id;
+                                                                        if ( $msg->structure[$msg_number]->parts[1]->parts[0]->encoding == 4 )
+                                                                                $msg->encoding[ $msg_number ][ $values ] = 'quoted-printable';
+                                                                }
+
+                                                                $body = $this->decodeBody(
                                                                         imap_fetchbody(
                                                                                 $this->mbox,
                                                                                 $msg_number,
-                                                                                ( $attachment['part_in_msg'] + (
-                                                                                        ( strtolower( $attachment[ 'type' ] ) == 'delivery-status' ) ? 0 : 1 )
-                                                                                ) . ".1",
+                                                                                ( $attachment['part_in_msg'] + ( ( int ) $id ) ) . ".1",
                                                                                 FT_UID
                                                                         ),
@@ -921 +928 @@
                                                                         $msg->charset[ $msg_number ][ $values ]
                                                                 );
+
+                                                                if ( strtolower( $msg->structure[$msg_number]->parts[1]->parts[0]->subtype ) == 'plain' )
+                                                                {
+                                                                        $body = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $body );
+                                                                        $body = nl2br( htmlentities( $body ) );
+                                                                        $body = $this -> replace_links( $body );
+                                                                        $body = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $body );
+                                                                        $body = '<span style="font-family: monospace">' . $body . '</span>';
+                                                                }
+
+                                                                $content .= $body;
                                                                 break;
                                                         }