From c0340cc2de3c1c162ce03bd08fae0d02f7f79ec0 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Tue, 30 Aug 2016 22:52:28 +0200
Subject: [PATCH] Cleanup login code
---
server.py | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/server.py b/server.py
index e1c64e6..be1aa86 100755
--- a/server.py
+++ b/server.py
@@ -15,11 +15,9 @@ config['SQLITE_INIT_SCHEMA'] = True
config['SQLITE_INIT_DATA'] = False
config['DEBUG'] = False
config['VIDEOPREFIX'] = 'https://videoag.fsmpi.rwth-aachen.de'
-
if __name__ == '__main__':
config['SQLITE_INIT_DATA'] = True
config['DEBUG'] = True
-
config.from_pyfile('config.py', silent=True)
from db import query, searchquery, ldapauth, ldapget
@@ -144,18 +142,12 @@ def login():
session['user'] = ldapget(user)
else:
flash('Login fehlgeschlagen!')
- if 'ref' in request.values:
- return redirect(request.values['ref'])
- else:
- return redirect(url_for('index'))
+ return redirect(request.values.get('ref', url_for('index')))
-@app.route('/logout')
+@app.route('/logout', methods=['GET', 'POST'])
def logout():
session.pop('user')
- if 'ref' in request.values:
- return redirect(request.values['ref'])
- else:
- return redirect(url_for('index'))
+ return redirect(request.values.get('ref', url_for('index')))
@app.route('/edit', methods=['GET', 'POST'])
@mod_required
--
GitLab