[checkmk-commits] Check_MK Git: check_mk: Allowing "%" and "+" in mail prefixes of contacts now

Module: check_mk Branch: master Commit: ede18e27b704b62b1d50693ffecc019c9ad2c25d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ede18e27b704b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 3 09:43:31 2013 +0100 Allowing "%" and "+" in mail prefixes of contacts now --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7125342..9d3eb83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,7 @@ * Modularized the authentication and user management code * Default config: add contact group 'all' and put all hosts into it * Reverse order of Condition, Value and General options in rule editor + * Allowing "%" and "+" in mail prefixes of contacts now Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5f5b2a8..77ba498 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7924,7 +7924,7 @@ def mode_edit_user(phase): # Email address email = html.var("email").strip() - regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$'-91ba54bb8mc + regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.+%]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$'-91ba54bb8mc if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email