Changeset 5247

Timestamp:

12/13/11 13:05:27 (12 years ago)

Author:

cristiano

Message:

Ticket #2378 - Links sem o http em mensagens criadas no ExpressoMail?

File:

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

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

@@ -1927 +1927 @@
         function replace_links_callback($matches)  
         {
-                if($matches[3]) 
-                        $pref = $matches[3]; 
-            else 
-                        $pref = $matches[3] = 'http'; 
-
-            return '<a href="'.$pref.'://'.$matches[4].$matches[5].'" target="_blank">'.$matches[4].$matches[5].'</a>'; 
+            if($matches[3]) 
+                    $pref = $matches[3]; 
+            else 
+                    $pref = $matches[3] = 'http'; 
+
+            return '<a href="'.$pref.'://'.$matches[4].$matches[5].'" target="_blank">'.$matches[0].'</a>'; 
         } 
 
@@ -1942 +1942 @@
         */
         function replace_links(&$body)
-                { 
+        { 
                 // Trata urls do tipo aaaa.bbb.empresa  
                 // Usadas na intranet.  
-                $pattern = '/(?<=[\s|(<br>)|\n|\r|;])(((http|https|ftp|ftps)?:\/\/((?:[\w]\.?)+(?::[\d]+)?[:\/.\-~&=?%;@#,+\w]*))|((?:www?\.)(?:\w\.?)*(?::\d+)?[\:\/\w.\-~&=?%;@+]*))/i';     
-                $replacement = '<a href="://$4$5" target="_blank">$4$5</a>'; 
-            $body = preg_replace_callback($pattern,array( &$this, 'replace_links_callback'), $body);
+                $pattern = '/(?<=[\s|(<br>)|\n|\r|;])(((http|https|ftp|ftps)?:\/\/((?:[\w]\.?)+(?::[\d]+)?[:\/.\-~&=?%;@#,+\w]*))|((?:www?\.)(?:\w\.?)*(?::\d+)?[\:\/\w.\-~&=?%;@+]*))/i';   
+                $body = preg_replace_callback($pattern,array( &$this, 'replace_links_callback'), $body);
 
         }