clicking on email addr sends you to compose screen

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@396 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/url_parser.php b/functions/url_parser.php
index 560c837d0363ae73abf0ab4471409281a03020ed..ff1df525dfc5f4c6d0213710d96fe3a8fc1079c7 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -11,7 +11,7 @@
    }
 
    function parseEmail ($body) {
-      $body = eregi_replace ("([a-z]|[0-9]|_|\.)+\@([a-z]|[0-9]|_)+(.([a-z]|[0-9]|_)+)*", "<a href=\"mailto:\\0\">\\0</a>", $body);
+      $body = eregi_replace ("([a-z]|[0-9]|_|\.|-)+\@([a-z]|[0-9]|_)+(\.([a-z]|[0-9]|_)+)*", "<a href=\"../src/compose.php?send_to=\\0\">\\0</a>", $body);
       return $body;
    }
 

diff --git a/src/compose.php b/src/compose.php
index 988cd76bca399ea8d3cb88c1f5c8851d86fb59b6..54d9314cccfbb729aa02053411b3029df34abb75 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -106,8 +106,10 @@
          }
       }
       
-      $send_to = sqimap_find_email($send_to);
-      
+      if (!$send_to) {
+         $send_to = sqimap_find_email($send_to);
+      }
+
       $send_to = ereg_replace("\"", "", $send_to);
       $send_to = stripslashes($send_to);