From fca49a01760c2e5122cd4f1a6b7a060b1a05a137 Mon Sep 17 00:00:00 2001 From: Ulrich Knechtelsdorfer Date: Sat, 4 Mar 2017 08:53:27 +0100 Subject: [PATCH] - fix unwanted password change --- app/views.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/views.py b/app/views.py index 7b74f97..3dda80e 100644 --- a/app/views.py +++ b/app/views.py @@ -364,20 +364,21 @@ def selfmanagement(): if not bcrypt.checkpw(request.form['password_old'], u.password): success = "Passwort falsch!" else: - if ('password1' in request.form) & ('password2' in request.form): - if request.form['password1'] == request.form['password2']: - u.password = bcrypt.hashpw(request.form['password1'], bcrypt.gensalt()) + if len(request.form['password1']) > 0: + if ('password1' in request.form) & ('password2' in request.form): + if (request.form['password1'] == request.form['password2']): + u.password = bcrypt.hashpw(request.form['password1'], bcrypt.gensalt()) - u.rfid_id = request.form['rfid_id'] + u.rfid_id = request.form['rfid_id'] - if 'onlyrfid' in request.form: - u.onlyrfid = True + if 'onlyrfid' in request.form: + u.onlyrfid = True + else: + u.onlyrfid = False + update_user(u) + success = u'Einstellungen wurden übernommen!' else: - u.onlyrfid = False - update_user(u) - success = u'Einstellungen wurden übernommen!' - else: - success = u'Neue Passwörter stimmen nicht überein!' + success = u'Neue Passwörter stimmen nicht überein!' else: u.rfid_id = request.form['rfid_id']