Changeset 2781

Timestamp:

05/14/10 11:14:07 (14 years ago)

Author:

niltonneto

Message:

Ticket #1076 - Corrigido exibição de text/plain. Removido nl2br e incluído tag <PRE>.

File:

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

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

@@ -818 +818 @@
                                 {
                                         $content = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $content );
-                                        $content = nl2br( htmlentities( $content ) );
+                                        $content = 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>';
-        
+                                        $content = '<pre style="font-family: monospace">' . $content . '</pre>';
+
                                         $return[ 'body' ] = $content;
-        
+
                                         return $return;
                                 }
                         }
                 }
-                else
+                else 
                 { //Complicated message, multiple parts
                         $html_body = '';
@@ -835 +835 @@
                         $has_multipart = true;
                         $this->has_cid = false;
-
+                        
                         if (strtolower($msg->structure[$msg_number]->subtype) == "related")
                                 $this->has_cid = true;
-
+                        
                         if (strtolower($msg->structure[$msg_number]->subtype) == "alternative") {
                                 $show_only_html = false;
@@ -844 +844 @@
                                         $file_type = strtolower($msg->file_type[$msg_number][$values]);
                                         if($file_type == "text/html")
-                                                $show_only_html = true;
+                                                $show_only_html = true;                 
                                 }
                         }
@@ -852 +852 @@
                         foreach($msg->pid[$msg_number] as $values => $msg_part)
                         {
-
-                                $file_type = strtolower($msg->file_type[$msg_number][$values]);
+                                $file_type = strtolower($msg->file_type[$msg_number][$values]); 
                                 if($file_type == "message/rfc822" || $file_type == "multipart/alternative")
                                 {
@@ -864 +863 @@
                                         }
                                 }
-
-                                if(($file_type == "text/plain"
+                                                                
+                                if(($file_type == "text/plain" 
                                         || $file_type == "text/html")
                                         && $file_type != 'attachment')
-                                {
+                                {                                       
                                         if($file_type == "text/plain" && !$show_only_html && $has_multipart)
                                         {
                                                 // if TXT file size > 100kb, then it will not expand.
                                                 if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > 102400)) {
-                                                        $content .= nl2br(htmlentities($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values])));
+                                                        $content .= htmlentities($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]));
+                                                        $content = '<pre style="font-family: monospace">' . $content . '</pre>';                                                        
                                                 }
                                         }
@@ -879 +879 @@
                                         else if($file_type == "text/html"  && $msg->fsize[$msg_number][$values] < 307200)
                                         {
-                                                $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);
+                                                $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;
                                         }
+                                        
                                 }
                                 else if($file_type == "message/delivery-status" || $file_type == "message/feedback-report"){
                                         $content .= "<hr align='left' width='95%' style='border:1px solid #DCDCDC'>";
-                                        $content .= nl2br($this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]));
+                                        $content .= $this->decodeBody(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values], $msg->charset[$msg_number][$values]);
+                                        $content = '<pre style="font-family: monospace">' . $content . '</pre>';
 
                                 }
                                 else if($file_type == "message/rfc822" || $file_type == "text/rfc822-headers"){
-
+                                        
                                         include_once("class.imap_attachment.inc.php");
                                         $att = new imap_attachment();
@@ -946 +948 @@
                                                                 {
                                                                         $body = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $body );
-                                                                        $body = nl2br( htmlentities( $body ) );
+                                                                        $body = 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>';
+                                                                        $body = '<pre style="font-family: monospace">' . $body . '</pre>';
                                                                 }