From cb9fc852cf39d91dfa1dc915073914fd153e774a Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Wed, 23 Sep 2009 13:25:05 -0400 Subject: [PATCH] - Fix regular expression for e-mail address (#1486152) --- CHANGELOG | 1 + program/include/rcube_string_replacer.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 20faf06..1eb7c8c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix regular expression for e-mail address (#1486152) - Fix Received header format - Implemented sorting by message index - added 'index_sort' option (#1485936) - Fix dl() use in installer (#1486150) diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index 2625fdf..b1c1fbb 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -39,7 +39,7 @@ $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 = "/([a-z0-9][a-z0-9\-\.\+\_]*@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5})/i"; } /** -- Gitblit v1.9.1