[checkmk-commits] Check_MK Git: check_mk: FIX: Allowing german umlauts in users mail addresses

Module: check_mk Branch: master Commit: b7042da5a2dbe4137c16249724060bcd4eaef675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7042da5a2dbe4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:39:09 2012 +0200 FIX: Allowing german umlauts in users mail addresses --- .bugs/690 | 7 +++++-- .bugs/693 | 9 +++++++-- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.bugs/690 b/.bugs/690 index f38fe52..79b7935 100644 --- a/.bugs/690 +++ b/.bugs/690 @@ -1,11 +1,14 @@ Title: Change default thresholds of ntp check Component: checks -State: open +Class: nastiness +State: done Date: 2012-04-02 15:25:35 Targetversion: future -Class: nastiness The default thresholds of the ntp check are too strict for most environments. Thresholds of 20.0ms and 50.0ms are not realistic for datacenter environments. We should change the default values to something less strict like around several seconds. + +2012-05-25 11:27:54: changed state open -> done +Increased thresholds by factor 10 to 200ms/500ms diff --git a/.bugs/693 b/.bugs/693 index cefd1b7..1524a9e 100644 --- a/.bugs/693 +++ b/.bugs/693 @@ -1,9 +1,14 @@ Title: Acknowledge WATO pending changes when applying config by using cmk Component: core -State: open +Class: nastiness +State: wontfix Date: 2012-04-25 12:23:47 Targetversion: future -Class: nastiness It confuses users that a manual restart via "cmk" command does not acknowledge the pending changes which can be found in the wato changelog. + +2012-05-25 11:31:44: changed state open -> wontfix +Esepcially in distributed wato setups this is not possible since cmk -R does not know anything about the +other sites. It would acknowledge the pending changes and remove the info that other sites don't have these +changes yet. diff --git a/ChangeLog b/ChangeLog index 5a47b37..d2395f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * Keep track of changes made by other users before activating changes, let user confirm this, new permission can be used to prevent a user from activating foreign changes. + * FIX: Allowing german umlauts in users mail addresses Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68d395b..70e6c15 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7519,7 +7519,7 @@ def mode_edit_user(phase): # Email address email = html.var("email").strip() - regex_email = '^[-a-zA-Z0-9_.]+(a)[-a-zA-Z0-9]+(\.[a-zA-Z]+)*$' + regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.[a-zA-Z]+)*$' if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email