Changeset 3039 for branches

Timestamp:

07/12/10 17:43:42 (14 years ago)

Author:

niltonneto

Message:

Ticket #1111 - Adicionado estilo white-space para corrigir problema no Firefox 2.0.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (4 diffs)

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

@@ -827 +827 @@
                                                 $content = $this -> replace_links( $content ); 
                                                 $content = str_replace( array( ' #$<$# ', ' #$>$# ' ), array( '<', '>' ), $content ); 
-                                                $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>'; 
+                                                $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;white-space:-moz-pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>'; 
 
                                                 $return[ 'body' ] = $content; 
@@ -880 +880 @@
                                                 if(!($file_type == "text/plain" && $msg->fsize[$msg_number][$values] > 102400)) {
                                                          $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="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>';    
+                                 $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;white-space:-moz-pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>';    
                                                 }
                                         }
@@ -892 +892 @@
                                  else if($file_type == "message/delivery-status" || $file_type == "message/feedback-report"){ 
                                         $content .= "<hr align='left' width='95%' style='border:1px solid #DCDCDC'>";
-                                         $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="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>'; 
+                                        $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="white-space:pre;word-wrap: break-word;white-space:pre-wrap;white-space:-moz-pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>'; 
                                 }
                                 else if($file_type == "message/rfc822" || $file_type == "text/rfc822-headers"){
@@ -956 +956 @@
                                                                         $body = $this -> replace_links( $body ); 
                                                                         $body = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $body ); 
-                                                                        $body = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $body . '</pre>'; 
+                                                                        $body = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;white-space:-moz-pre-wrap;font-family: monospace;font-size:12px">' . $body . '</pre>'; 
                                                                 }