fixed issue 1950, allow change password for any old password complexity
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.9.5-trunk+timestamp.2014.08.08.00.12.19
|
Version 2.9.5-trunk+timestamp.2014.08.08.00.36.55
|
||||||
|
|||||||
+3
-3
@@ -3222,8 +3222,7 @@ class Auth(object):
|
|||||||
passfield = self.settings.password_field
|
passfield = self.settings.password_field
|
||||||
form = SQLFORM.factory(
|
form = SQLFORM.factory(
|
||||||
Field('old_password', 'password',
|
Field('old_password', 'password',
|
||||||
label=self.messages.old_password,
|
label=self.messages.old_password),
|
||||||
requires=table_user[passfield].requires),
|
|
||||||
Field('new_password', 'password',
|
Field('new_password', 'password',
|
||||||
label=self.messages.new_password,
|
label=self.messages.new_password,
|
||||||
requires=table_user[passfield].requires),
|
requires=table_user[passfield].requires),
|
||||||
@@ -3242,7 +3241,8 @@ class Auth(object):
|
|||||||
onvalidation=onvalidation,
|
onvalidation=onvalidation,
|
||||||
hideerror=self.settings.hideerror):
|
hideerror=self.settings.hideerror):
|
||||||
|
|
||||||
if not form.vars['old_password'] == s.select(limitby=(0,1), orderby_on_limitby=False).first()[passfield]:
|
current_user = s.select(limitby=(0,1), orderby_on_limitby=False).first()
|
||||||
|
if not form.vars['old_password'] == current_user[passfield]:
|
||||||
form.errors['old_password'] = self.messages.invalid_password
|
form.errors['old_password'] = self.messages.invalid_password
|
||||||
else:
|
else:
|
||||||
d = {passfield: str(form.vars.new_password)}
|
d = {passfield: str(form.vars.new_password)}
|
||||||
|
|||||||
Reference in New Issue
Block a user