[checkmk-commits] 4327 FIX Allowing dollar sign in mail addresses now

Module: check_mk Branch: master Commit: 87854fb79a51f4d94a62250c9d395426235c07ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87854fb79a51f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 12:47:13 2017 +0100 4327 FIX Allowing dollar sign in mail addresses now Change-Id: I410d89157bf15f58d2ee04e99ac83ff1c9771800 --- .werks/4327 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4327 b/.werks/4327 new file mode 100644 index 0000000..4b6c0b3 --- /dev/null +++ b/.werks/4327 @@ -0,0 +1,9 @@ +Title: Allowing dollar sign in mail addresses now +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486467997 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d724b13..fb9d39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets * 4323 FIX: Fixed wrong %s in notification rule title deletion confirm dialog * 4324 FIX: Fixed possible exception when saving user with special characters in user name + * 4327 FIX: Allowing dollar sign in mail addresses now Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3b770d3..0651bc3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -663,7 +663,7 @@ class EmailAddressUnicode(TextUnicode, EmailAddress): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) EmailAddress.__init__(self, **kwargs) - self._regex = re.compile(r'^[\w._%+-]+(a)(localhost|[\w.-]+\.[\w]{2,24})$'})$', re.I | re.UNICODE) + self._regex = re.compile(r'^[$\w._%+-]+(a)(localhost|[\w.-]+\.[\w]{2,24})$'})$', re.I | re.UNICODE) def validate_value(self, value, varprefix): TextUnicode.validate_value(self, value, varprefix)