Merge branch 'master' of ssh://git.spline.de/account-web

Conflicts:
	templates/base.html

1 files changed, 10 insertions, 7 deletions

diff --git a/app.py b/app.py
index 3785ac8..3b4c202 100644
--- a/app.py
+++ b/app.py
@@ -47,13 +47,16 @@ def read_blacklist():
 @app.route('/', methods=['GET', 'POST'])
 @templated('index.html')
 def index():
-    form = LoginForm(request.form)
-    if request.method == 'POST' and form.validate():
-        if login_user(form.username.data, form.password.data):
-            flash(u'Erfolgreich eingeloggt', 'success')
-            return redirect(url_for('settings'))
-        else:
-            flash(u'Ungültiger Benutzername und/oder Passwort', 'error')
+    if not g.user:
+        form = LoginForm(request.form)
+        if request.method == 'POST' and form.validate():
+            if login_user(form.username.data, form.password.data):
+                flash(u'Erfolgreich eingeloggt', 'success')
+                return redirect(url_for('settings'))
+            else:
+                flash(u'Ungültiger Benutzername und/oder Passwort', 'error')
+    else:
+        return redirect(url_for('settings'))
 
     return {'form': form}