From 35180d61fa6e313d6d9dedf9f9aae6167c2c5baf Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 25 Sep 2013 09:44:37 -0500 Subject: [PATCH] simplification in auth multilogin --- VERSION | 2 +- gluon/tools.py | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index 4623a111..4ad40451 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/tools.py b/gluon/tools.py index 4d30f83d..e02fe27c 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2294,18 +2294,12 @@ class Auth(object): accepted_form = True # check for username in db - if multi_login: - entered_username = form.vars[username] - if entered_username.find('@') < 0: - #no @, look for a 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}) + entered_username = form.vars[username] + if multi_login and '@' in entered_username: + # if '@' in username check for email, not username + user = table_user(email = entered_username) else: - user = table_user(**{username: form.vars[username]}) + user = table_user(**{username: entered_username}) if user: # user in db, check if registration pending or disabled temp_user = user