[checkmk-commits] Check_MK Git: check_mk: FIX: allow email addresses like test at test.test-test .com

git version control git at mathias-kettner.de
Mon Nov 19 14:48:50 CET 2012


Module: check_mk
Branch: master
Commit: 0dffc7d2557ea07c4787c4c92e47693f8703450a
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dffc7d2557ea07c4787c4c92e47693f8703450a

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Mon Nov 19 14:48:16 2012 +0100

FIX: allow email addresses like test at test.test-test.com

---

 ChangeLog          |    1 +
 web/htdocs/wato.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d37a685..4f77bdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,7 @@
 1.2.0p4:
     WATO:
     * FIX: fixed detection of existing groups when creating new groups
+    * FIX: allow email addresses like test at test.test-test.com
 
 
 1.2.0p3:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index b8604bc..7a19795 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7976,7 +7976,7 @@ def mode_edit_user(phase):
 
         # Email address
         email = html.var("email").strip()
-        regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+@[-a-zäöüÄÖÜA-Z0-9]+(\.[a-zA-Z]+)*$'
+        regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+@[-a-zäöüÄÖÜA-Z0-9]+(\.[-a-zäöüÄÖÜA-Z0-9]+)*$'
         if email and not re.match(regex_email, email):
             raise MKUserError("email", _("'%s' is not a valid email address." % email))
         new_user["email"] = email



More information about the checkmk-commits mailing list