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

simplification in auth multilogin

Browse Source
This commit is contained in:
mdipierro
2013-09-25 09:44:37 -05:00
parent 8954d90ada
commit 35180d61fa
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.4-stable+timestamp.2013.09.25.09.07.40 Version 2.6.4-stable+timestamp.2013.09.25.09.42.32
gluon/tools.py
+5 -11
View File
@@ -2294,18 +2294,12 @@ class Auth(object):
accepted_form = True accepted_form = True
# check for username in db # check for username in db
if multi_login: entered_username = form.vars[username]
entered_username = form.vars[username] if multi_login and '@' in entered_username:
if entered_username.find('@') < 0: # if '@' in username check for email, not username
#no @, look for a username user = table_user(email = entered_username)
#TODO: Is this still true?
#NOTE: @ is no allowed for usernames, so a username will
# never have an @ symbol unless an admin made it
user = table_user(**{'username': entered_username})
else:
user = table_user(**{'email': entered_username})
else: else:
user = table_user(**{username: form.vars[username]}) user = table_user(**{username: entered_username})
if user: if user:
# user in db, check if registration pending or disabled # user in db, check if registration pending or disabled
temp_user = user temp_user = user