[checkmk-commits] Check_MK Git: check_mk: Small parameter handling improvements when params are missing, better error messages

Module: check_mk Branch: master Commit: d29602dbfd6a25a21d77e7dbd4a62428d568d245 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29602dbfd6a25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 11:17:44 2013 +0100 Small parameter handling improvements when params are missing, better error messages --- web/htdocs/wato.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c77cba2..420c978 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7509,6 +7509,8 @@ def automation_push_snapshot(): raise MKGeneralException(message) tarcontent = html.var('snapshot') + if not tarcontent: + raise MKGeneralException(_('Invalid call: The snapshot is missing.')) multitar.extract_from_buffer(tarcontent, replication_paths) log_commit_pending() # pending changes are lost @@ -7939,8 +7941,8 @@ def mode_edit_user(phase): increase_serial = True # password changed, reflect in auth serial else: - password = html.var("password").strip() - password2 = html.var("password2").strip() + password = html.var("password", '').strip() + password2 = html.var("password2", '').strip() # Detect switch back from automation to password if "automation_secret" in new_user: @@ -7962,14 +7964,14 @@ def mode_edit_user(phase): new_user['serial'] = new_user.get('serial', 0) + 1 # Email address - email = html.var("email").strip() + 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 if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email # Pager - pager = html.var("pager").strip() + pager = html.var("pager", '').strip() new_user["pager"] = pager # Roles