Changeset 2451 for branches/2.0

Timestamp:

04/07/10 16:22:03 (14 years ago)

Author:

rodsouza

Message:

Ticket #1025 - Removendo a instrução 'new_message_to'. Tranferido para o javascript.

Location:

branches/2.0/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/draw_api.js (modified) (1 diff)

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

@@ -1157 +1157 @@
                 // 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';
+                $replacement = '$1<a href="mailto:$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;
@@ -1727 +1721 @@
                                 return "The server denied your request to send a mail, you cannot use this mail address.";
                 }
-
-                //new_message_to backs to mailto: pattern
-                $params['body'] = eregi_replace("<a href=\"javascript:new_message_to\('([^>]+)'\)\">[^>]+</a>","<a href='mailto:\\1'>\\1</a>",$params['body']);
 
                 $toaddress = implode(',',$db->getAddrs(explode(',',$params['input_to'])));

branches/2.0/expressoMail1_2/js/draw_api.js

@@ -1769 +1769 @@
         newBody = newBody.replace("<BODY","<span");
         div.innerHTML+= "<span id='body_"+ID+"'>"+newBody+"</span><br><br>";
+        function mailto( link )
+        {
+                var mail = link.href.substr( 7 );
+                link.onclick = function( )
+                {
+                        new_message_to( mail );
+                        return false;
+                };
+        }
+        var links = div.getElementsByTagName( 'a' );
+        for ( var i = 0; i < links.length; i++ )
+                if ( links.item( i ).href.indexOf( 'mailto:' ) === 0 )
+                        mailto( links.item( i ) );
         //////////////////////////////////////////////////////////////////////////////////////////////////////  
         //Make the thumbs of the message.