From b6244d5ce7aa442d14dcd4c0cdf828dc22027af9 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 10 Aug 2010 07:53:17 +0000 Subject: - Improve email regexp in mailto: links handler (#1486808) --- program/include/rcube_string_replacer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'program/include') diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index 03c04dd63..0568cc072 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -39,7 +39,10 @@ class rcube_string_replacer $url_chars_within = '\?\.~,!'; $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i"; - $this->mailto_pattern = "/([a-z0-9][a-z0-9\-\.\+\_]*@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5})/i"; + $this->mailto_pattern = "/(" + ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*" // local-part + ."@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5}" // domain-part + .")/i"; } /** -- cgit v1.2.3