Changeset 13 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

04/10/07 10:21:10 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

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

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

@@ -588 +588 @@
                 */
                 // HTML Filter
-                //$body = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=# onclick=\"javascript:new_message('new_by_message', '\\2@\\3')\">\\2@\\3</a>", $body);      
-        
+                //$body = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=# onclick=\"javascript:new_message('new_by_message', '\\2@\\3')\">\\2@\\3</a>", $body);
         $body = str_replace("\r\n", "\n", $body);
                 if ($encoding == 'quoted-printable')
             {
+                        
                         for($i=0;$i<256;$i++) {
                                 $c1=dechex($i);
@@ -611 +611 @@
                 $body = base64_decode($body);
         }
-        else if ($encoding == '7bit') 
+        /*else if ($encoding == '7bit') 
         {
-                $body = quoted_printable_decode($body);
-        }
+                $body = quoted_printable_decode($body);                                         
+        }*/
                 // All other encodings are returned raw.
                 if (strtolower($charset) == "utf-8")
@@ -692 +692 @@
                 // It no has exception,then open the link in new window.
                 if(!count($matches)){
-                        $body = @eregi_replace("<a href=", "<a target='_blank' href=", $body);
+                        $body = @eregi_replace("<a (.*) href=", "<a \\1 target='_blank' href=", $body);
+                        $body = @str_replace("<a href=", "<a target='_blank' href=", $body);
                         $body = @eregi_replace("target=\"\"", "target='_blank'", $body);
                         $body = @eregi_replace("target=''", "target='_blank'", $body);
@@ -1501 +1502 @@
                 $str = ereg_replace('"', '&quot;', $str);
                 $str = ereg_replace('\'', '&#039;', $str);
+                
                 $str = ereg_replace('<', '&lt;', $str);
                 $str = ereg_replace('>', '&gt;', $str);