Changeset 2957 for branches

Timestamp:

06/18/10 14:23:06 (14 years ago)

Author:

niltonneto

Message:

Ticket #1111 - Correção de problema ao responder, encaminhar e imprimir email text/plain.

Location:

branches/2.0/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (4 diffs)
• templates/classic/main.css (modified) (1 diff)
• templates/default/main.css (modified) (1 diff)

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

@@ -731 +731 @@
                                         $content = $this -> replace_links( $content );
                                         $content = str_replace( array( ' #$<$# ', ' #$>$# ' ), array( '<', '>' ), $content );
-                                        $content = '<pre class="preWrap">' . $content . '</pre>';
+                                        $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>';
 
                                         $return[ 'body' ] = $content;
@@ -783 +783 @@
                                                 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 class="preWrap">' . $content . '</pre>';                                                       
+                                                        $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>';                                                      
                                                 }
                                         }
@@ -797 +797 @@
                                         $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 class="preWrap">' . $content . '</pre>';
+                                        $content = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $content . '</pre>';
 
                                 }
@@ -861 +861 @@
                                                                         $body = $this -> replace_links( $body );
                                                                         $body = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $body );
-                                                                        $body = '<pre class="preWrap">' . $body . '</pre>';
+                                                                        $body = '<pre style="white-space:pre;word-wrap: break-word;white-space:pre-wrap;font-family: monospace;font-size:12px">' . $body . '</pre>';
                                                                 }
 

branches/2.0/expressoMail1_2/templates/classic/main.css

@@ -10 +10 @@
         font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 13px;
-}
-.preWrap{
-        /* CSS2 */
-        white-space:pre;
-        /* IE */
-        word-wrap: break-word;
-        /* IE6 */
-        white-space:pre-wrap;
-        font-family: monospace;
 }
 

branches/2.0/expressoMail1_2/templates/default/main.css

@@ -11 +11 @@
         font-size: 13px;
 }
-.preWrap{
-        /* CSS2 */
-        white-space:pre;
-        /* IE */
-        word-wrap: break-word;
-        /* IE6 */
-        white-space:pre-wrap;
-        font-family: monospace;
-}
+
 .whiteSpace{
         width: 2px;