Changeset 7728

Timestamp:

01/10/13 14:46:22 (11 years ago)

Author:

cristiano

Message:

Ticket #3276 - Problema para encaminhar certas mensagens

File:

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

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

@@ -1658 +1658 @@
                 $content = $this->process_embedded_images($images,$msg_number,$content, $msg_folder);
                 $content = $this->replace_special_characters($content);
-                $this->replace_links($content);
+              $this->replace_links($content);
                 $return['body'] = &$content;
                 
@@ -1936 +1936 @@
 
         function replace_special_characters($body) 
-        {               
+        {
+
+
+
             if(trim($body) === '') return;
             
@@ -1997 +2000 @@
             return $matches[0];
         }
-
-        if($matches[3]) 
-            $pref = $matches[3]; 
+                
+        if($matches[4]) 
+            $pref = $matches[4]; 
         else 
-            $pref = $matches[3] = 'http'; 
-
-            return '<a href="'.$pref.'://'.$matches[4].$matches[5].'" target="_blank">'.$matches[0].'</a>'; 
+            $pref = $matches[4] = 'http';  
+                        
+                $url = isset($matches[6]) ? $matches[5].$matches[6] : $matches[5];
+
+            return '<a href="'.$pref.'://'.$url.'" target="_blank">'.$matches[0].'</a>'; 
         } 
 
@@ -2018 +2023 @@
 
                 $pattern = '/(background-image\:url\()?(?<=[\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);
+       
+                $body = preg_replace_callback($pattern,array( &$this, 'replace_links_callback'), $body);
 
         }