Merge pull request #431 from ortgit/enhancement/two_step_authentication

Added support for two-step authentication.
2014-05-26 22:27:23 -05:00
parent e66f201191 89893c91da
commit 7e9c9dbe93
2 changed files with 236 additions and 126 deletions
@@ -3,7 +3,7 @@
 <h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
 <div id="web2py_user_form">
 {{
-if request.args(0)=='login':
+if request.args(0)=='login' and not session.auth_2_factor_user:
    if not 'register' in auth.settings.actions_disabled:
        form.add_button(T('Register'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn')
    pass