Changeset 1828

Timestamp:

12/14/09 15:46:28 (14 years ago)

Author:

niltonneto

Message:

Ticket #788 - Corrigido problema no método replace_links (regexp).

File:

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

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

@@ -428 +428 @@
                 $return_get_body = $this->get_body_msg($msg_number, $msg_folder);
                 
-                //Substituição de links em email para abrir no próprio expresso
-                $body = mb_ereg_replace("<a[^>]*href=[\'\"]mailto:([^\"\']+)[\'\"]>([^<]+)</a>","<a href=\"javascript:new_message_to('\\1')\">\\2</a>",$return_get_body['body']);
-
+                $body = $return_get_body['body'];
                 //Remoção de tags <span></span> para correção de erro no firefox
                 $body = mb_ereg_replace("<span><span>","",$body);
@@ -1015 +1013 @@
                         'applet','embed','frameset','xml','xmp','style');
 
-                $body = $this-> replace_links($body);
-                $blocked_tags = array();                
+                $blocked_tags = array();
                 foreach($tag_list as $index => $tag) {
                         $new_body = @mb_eregi_replace("<$tag", "<!--$tag", $body);
@@ -1031 +1028 @@
                         $body = str_replace($rest[1][$i],"<".$rest[2][$i].$rest[3][$i].$rest[7][$i].">",$body);
 
-                return  "<span>".$body;
+                return  "<span>".$this-> replace_links($body);
         }
 
@@ -1041 +1038 @@
                 if(count($matches))
                         return $body;
-        
-                $pattern = '/(?<=[\s\><\n\r;])((http(s?):\/\/((?:[\w]\.?)+(?::[\d]+)?[\/.\-~&=?%;@#,+\w:]*))|((?:www?\.)(?:\w\.?)*(?::\d+)?[\/\w.\-~&=?%;@+]*))/i';
-                $replacement = '<a href="http$3://$4$5" target="_blank">$1</a>';
-                return preg_replace($pattern, $replacement, $body); 
-                
-                // Original
-                //return preg_replace('/(?<=[\s|(<br>)|\n|\r|;])((http(s?):\/\/((?:[\w]\.?)+(?::[\d]+)?[\/.\-~&=?%;@#,+\w]*))|((?:www?\.)(?:\w\.?)*(?::\d+)?[\/\w.\-~&=?%;@+]*))/i', '<a href="http$3://$4$5" target="_blank">http$3://$4$5</a>', $body);
+
+                /* Replace links tags <a href="" ></a> to links with target=_blank */
+                $pattern = '/<a[^>]+href="([^>"]+)"[^>]*>(.*)<\/a>/im';
+                $replacement = '<a href="$1" target="_blank">$2</a>';
+                $body = preg_replace($pattern, $replacement, $body);
+
+                /*Replace websites that does NOT begin with href=" to links */
+                $pattern = '/([^h][^r][^e][^f][^=][^"])((https?:\/\/)[A-Za-z0-9\.~?\/_=&#;\-:]*)/m';
+                $replacement = '$1<a href="$2" target="_blank">$2</a>';
+                $body = preg_replace($pattern, $replacement, $body);
+
+                /*Transform email address in new_message_to*/
+                $pattern = '/([A-Za-z0-9\.~?\/_=#\-]*@[A-Za-z0-9\.~?\/_=#\-]*)/im';
+                $replacement = '<a href="javascript:new_message_to(\'$1\')">$1</a>';
+                $body = preg_replace($pattern, $replacement, $body);
+
+                /*Subs. email links to expresso*/
+                $body = mb_ereg_replace("<a[^>]*href=[\'\"]mailto:([^\"\']+)[\'\"]>([^<]+)</a>",
+                        "<a href=\"javascript:new_message_to('\\1')\">\\2</a>",$body);
+
+
+                return $body;
         }