Changeset 1897

Timestamp:

12/28/09 13:55:19 (14 years ago)

Author:

rodsouza

Message:

Ticket #859 - Alterado a forma de manipular links na visualização 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

@@ -869 +869 @@
                                         $attachments =  $att -> get_attachment_info($this->mbox,$msg_number);
                                         if($attachments['number_attachments'] > 0) {
-                                                foreach($attachments ['attachment'] as $index => $attachment){
-                                                        if(strtolower($attachment['type']) == "delivery-status" ||
-                                                                strtolower($attachment['type']) == "rfc822" ||
-                                                                strtolower($attachment['type']) == "rfc822-headers" ||
-                                                                strtolower($attachment['type']) == "plain"
-                                                        ){
-                                                                $obj = imap_rfc822_parse_headers(imap_fetchbody($this->mbox, $msg_number, $msg_part, FT_UID), $msg->encoding[$msg_number][$values]);
-                                                                $content .= "<hr align='left' width='95%' style='border:1px solid #DCDCDC'>";
-                                                                $content .= "<br><table  style='margin:2px;border:1px solid black;background:#EAEAEA'>";
-                                                                $content .= "<tr><td><b>".$this->functions->getLang("Subject").":</b></td><td>".$this->decode_string($obj->subject)."</td></tr>";
-                                                                $content .= "<tr><td><b>".$this->functions->getLang("From").":</b></td><td>".$this->decode_string($obj->from[0]->mailbox."@".$obj->from[0]->host)."</td></tr>";
-                                                                $content .= "<tr><td><b>".$this->functions->getLang("Date").":</b></td><td>".$obj->date."</td></tr>";
-                                                                $content .= "<tr><td><b>".$this->functions->getLang("TO").":</b></td><td>".$this->decode_string($obj->to[0]->mailbox."@".$obj->to[0]->host)."</td></tr>";
-                                                                $content .= !$obj->cc ? "</table><br>" :"<tr><td><b>".$this->functions->getLang("CC").":</b></td><td>".$this->decode_string($obj->cc[0]->mailbox."@".$obj->cc[0]->host)."</td></tr></table><br>";
+                                                foreach($attachments ['attachment'] as $index => $attachment)
+                                                {
+                                                        if ( in_array( strtolower( $attachment[ 'type' ] ), array( 'delivery-status', 'rfc822', 'rfc822-headers', 'plain' ) ) )
+                                                        {
+                                                                $obj = imap_rfc822_parse_headers( imap_fetchbody( $this -> mbox, $msg_number, $msg_part, FT_UID ), $msg -> encoding[ $msg_number ][ $values ] );
+
+                                                                $content .= '<hr align="left" width="95%" style="border:1px solid #DCDCDC">';
+                                                                $content .= '<br><table  style="margin:2px;border:1px solid black;background:#EAEAEA">';
+
+                                                                $content .= '<tr><td><b>' . $this->functions->getLang("Subject")
+                                                                        . ':</b></td><td>' .$this->decode_string($obj->subject) . '</td></tr>';
+
+                                                                $content .= '<tr><td><b>' . $this -> functions -> getLang( 'From' ) . ':</b></td><td>'
+                                                                        . $this -> replace_links( $this -> decode_string( $obj -> from[ 0 ] -> mailbox . '@' . $obj -> from[ 0 ] -> host) )
+                                                                        . '</td></tr>';
+
+                                                                $content .= '<tr><td><b>' . $this->functions->getLang("Date") . ':</b></td><td>' . $obj->date . '</td></tr>';
+
+                                                                $content .= '<tr><td><b>' . $this -> functions -> getLang( 'TO' ) . ':</b></td><td>'
+                                                                        . $this -> replace_links( $this -> decode_string( $obj -> to[ 0 ] -> mailbox . '@' . $obj -> to[ 0 ] -> host ) )
+                                                                        . '</td></tr>';
+
+                                                                if ( $obj->cc )
+                                                                        $content .= '<tr><td><b>' . $this -> functions -> getLang( 'CC' ) . ':</b></td><td>'
+                                                                                . $this -> replace_links( $this -> decode_string( $obj -> cc[ 0 ] -> mailbox . '@' . $obj -> cc[ 0 ] -> host ) )
+                                                                                . '</td></tr>';
+
+                                                                $content .= '</table><br>';
+
                                                                 $content .= $this->decodeBody(
                                                                         imap_fetchbody(
@@ -1132 +1147 @@
         }
 
-        function replace_links($body) {
-                $matches = array();
+        function replace_links( $body )
+        {
+                $matches = array( );
                 // Verify exception.
-                @preg_match("/<a href=\"notes:\/\/\//",$body,$matches);
-                // If there is no exception,then open the link in new window.
-                if(count($matches))
+                @preg_match( "/<a href=\"notes:\/\/\//", $body, $matches );
+
+                // If there is no exception, then open the link in new window.
+                if ( count( $matches ) )
                         return $body;
 
-                /* Replace links tags <a href="" ></a> to links with target=_blank */
+                // All links should be moderated and they should only have the attribute '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);
-
+                $body = preg_replace( $pattern, $replacement, $body );
+
+                // 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';
+                $replacement = '$1<a href="http$4://$5" target="_blank">$2</a>';
+                $body = preg_replace( $pattern, $replacement, $body );
+
+                // E-mail address in the text should create a new e-mail on ExpressoMail
+                $pattern = '/( |<|&lt;|>)([A-Za-z0-9\.~?\/_=#\-]*@[A-Za-z0-9\.~?\/_=#\-]*)( |>|&gt;|<)/im';
+                $replacement = '$1<a href="javascript:new_message_to(\'$2\')">$2</a>$3';
+                $body = preg_replace( $pattern, $replacement, $body );
+
+                // If there is an link with a "mailto:" in href attribute, it will changed to create a new e-mail on ExpressoMail.
+                $pattern = '/<a[^>]+href=["\']mailto:([^"]+)["\'][^>]*>([^<]+)<\/a>/im';
+                $replacement = '<a href="javascript:new_message_to(\'$1\')">$2</a>';
+                $body = preg_replace( $pattern, $replacement, $body );
 
                 return $body;