Changeset 2041

Timestamp:

02/22/10 14:08:57 (14 years ago)

Author:

rodsouza

Message:

Ticket #859 - Refinamento da expressão regular que busca por URLs no corpo do e-mail.

File:

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

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

@@ -809 +809 @@
                         if ( strtolower( $msg -> structure[ $msg_number ] -> subtype ) == 'plain' )
                         {
-                                $content = str_replace( array( '<', '>' ), array( '#$<$# ', ' #$>$#' ), $content );
+                                $content = str_replace( array( '<', '>' ), array( ' #$<$# ', ' #$>$# ' ), $content );
                                 $content = nl2br( htmlentities( $content ) );
+                                $content = $this -> replace_links( $content );
+                                $content = str_replace( array( ' #$&lt;$# ', ' #$&gt;$# ' ), array( '&lt;', '&gt;' ), $content );
                                 $content = '<span style="font-family: monospace">' . $content . '</span>';
-                                $content = $this -> replace_links( $content );
-                                $content = str_replace( array( '#$&lt;$# ', ' #$&gt;$#' ), array( '&lt;', '&gt;' ), $content );
 
                                 $return[ 'body' ] = $content;
@@ -1176 +1176 @@
 
                 // Url found in the text and which is not a link yet should be replaced by one.
-                $pattern = '/(^|[\w"]>|[ \(\[])((http(s)?:\/\/)?([\w\d_\-@]{2,}(\.[\w\d~?\/_=&#;\-:@$]+)+))/im';
+                $pattern = '/(^| |[\w"]>|[ \(\[])((http(s)?:\/\/)?([\w\d_\-@]{2,}(\.[\w\d~?\/_=&#;\-:@$]+)+))/im';
                 $replacement = '$1<a href="http$4://$5" target="_blank">$2</a>';
                 $body = preg_replace( $pattern, $replacement, $body );