Changeset 2037

Timestamp:

02/22/10 11:07:25 (14 years ago)

Author:

amuller

Message:

Ticket #859 - Resolvendo problema de links...................

File:

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

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

@@ -789 +789 @@
                 if(!$msg->structure[$msg_number]->parts) //Simple message, only 1 piece
                 {
-            if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
-                $return['body']='isCripted';
-                return $return;
-            }
+                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
+                                $return['body']='isCripted';
+                                return $return;
+                        }
 
                         $attachment = array(); //No attachments
 
-            if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
-                                        $return['body']='isCripted';
-                                        return $return;
-                        }
-
-                        $content = '';
-                        if (strtolower($msg->structure[$msg_number]->subtype) == "plain")
+                        if(strtolower($msg->structure[$msg_number]->subtype) == 'x-pkcs7-mime'){
+                                $return['body']='isCripted';
+                                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 .= '<span style="font-family: monospace">' . nl2br($this->decodeBody((imap_body($this->mbox, $msg_number, FT_UID)), $msg->encoding[$msg_number][0], $msg->charset[$msg_number][0])) . '</span>';
-                        }
-                        else if (strtolower($msg->structure[$msg_number]->subtype) == "html")
-                        {
-                                $content .= $this->decodeBody(imap_body($this->mbox, $msg_number, FT_UID), $msg->encoding[$msg_number][0], $msg->charset[$msg_number][0]);
+                                $content = str_replace( array( '<', '>' ), array( '#$<$# ', ' #$>$#' ), $content );
+                                $content = nl2br( htmlentities( $content ) );
+                                $content = '<span style="font-family: monospace">' . $content . '</span>';
+                                $content = $this -> replace_links( $content );
+                                $content = str_replace( array( '#$&lt;$# ', ' #$&gt;$#' ), array( '&lt;', '&gt;' ), $content );
+
+                                $return[ 'body' ] = $content;
+
+                                return $return;
                         }
                 }
@@ -928 +937 @@
                 $params = array('folder' => $msg_folder, "msgs_to_set" => $msg_number, "flag" => "seen");
                 $this->set_messages_flag($params);
+
                 $content = $this->process_embedded_images($msg,$msg_number,$content, $msg_folder);
                 $content = $this->replace_special_characters($content);
                 $return['body'] = $content;
+
                 return $return;
         }