Merge pull request #431 from ortgit/enhancement/two_step_authentication

Added support for two-step authentication.
web2py · May 27, 2014 · 7e9c9db · 7e9c9db
2 parents e66f201 + 89893c9
commit 7e9c9db
Show file tree

Hide file tree

Showing 2 changed files with 238 additions and 128 deletions.
diff --git a/applications/welcome/views/default/user.html b/applications/welcome/views/default/user.html
@@ -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