dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal simplications in Auth

Browse Source
This commit is contained in:
mdipierro
2012-08-26 17:57:10 -05:00
parent 3e51459612
commit a85ee973ed
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-26 17:53:23) dev Version 2.00.0 (2012-08-26 17:57:07) dev
gluon/tools.py
+4 -4
View File
@@ -2197,7 +2197,7 @@ class Auth(object):
key = getarg(-1) key = getarg(-1)
table_user = self.table_user() table_user = self.table_user()
user = self.db(table_user.registration_key == key).select().first() user = table_user(registration_key=key)
if not user: if not user:
redirect(self.settings.login_url) redirect(self.settings.login_url)
if self.settings.registration_requires_approval: if self.settings.registration_requires_approval:
@@ -2272,7 +2272,7 @@ class Auth(object):
if form.accepts(request, session, if form.accepts(request, session,
formname='retrieve_username', dbio=False, formname='retrieve_username', dbio=False,
onvalidation=onvalidation,hideerror=self.settings.hideerror): onvalidation=onvalidation,hideerror=self.settings.hideerror):
user = self.db(table_user.email == form.vars.email).select().first() user = table_user(email=form.vars.email)
if not user: if not user:
current.session.flash = \ current.session.flash = \
self.messages.invalid_email self.messages.invalid_email
@@ -2350,7 +2350,7 @@ class Auth(object):
if form.accepts(request, session, if form.accepts(request, session,
formname='retrieve_password', dbio=False, formname='retrieve_password', dbio=False,
onvalidation=onvalidation,hideerror=self.settings.hideerror): onvalidation=onvalidation,hideerror=self.settings.hideerror):
user = self.db(table_user.email == form.vars.email).select().first() user = table_user(email=form.vars.email)
if not user: if not user:
current.session.flash = \ current.session.flash = \
self.messages.invalid_email self.messages.invalid_email
@@ -2490,7 +2490,7 @@ class Auth(object):
formname='reset_password', dbio=False, formname='reset_password', dbio=False,
onvalidation=onvalidation, onvalidation=onvalidation,
hideerror=self.settings.hideerror): hideerror=self.settings.hideerror):
user = self.db(table_user.email == form.vars.email).select().first() user = table_user(email=form.vars.email)
if not user: if not user:
session.flash = self.messages.invalid_email session.flash = self.messages.invalid_email
redirect(self.url(args=request.args)) redirect(self.url(args=request.args))