From 8a82571c481ce09a64fb229e91ab7958b7c18f60 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Fri, 10 Jun 2016 09:30:00 +0200
Subject: replace hand-crafted redirects by referrers

---
 app.py               | 27 +++++++++------------------
 templates/index.html |  9 ---------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app.py b/app.py
index 876e20b..5a41f10 100644
--- a/app.py
+++ b/app.py
@@ -327,64 +327,57 @@ def page(num):
 @app.route('/submit', methods=['POST'])
 def submit():
     text = request.form['text']
-    page = request.form['redirpage']
     db().addJoke(text, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/edit', methods=['POST'])
 def edit():
     text = request.form['text']
-    page = request.form['redirpage']
     joke = int(request.form['id'])
     if not db().mayModifyJoke(joke, userid()):
         abort(403)
     db().updateJoke(text, joke)
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/upvote', methods=['POST'])
 def upvote():
     joke = int(request.form['id'])
-    page = request.form['redirpage']
     if db().hasVoted(joke, userid()):
         db().unvoteJoke(joke, userid())
     db().voteJoke(joke, False, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/downvote', methods=['POST'])
 def downvote():
     joke = int(request.form['id'])
-    page = request.form['redirpage']
     if db().hasVoted(joke, userid()):
         db().unvoteJoke(joke, userid())
     db().voteJoke(joke, True, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/report', methods=['POST'])
 def report():
     joke = int(request.form['id'])
-    page = request.form['redirpage']
     if db().hasVoted(joke, userid()):
         db().unvoteJoke(joke, userid())
     db().reportJoke(joke, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/delete', methods=['POST'])
 def delete():
     joke = int(request.form['id'])
-    page = request.form['redirpage']
     if not db().mayModifyJoke(joke, userid()):
         abort(403)
     db().removeJoke(joke, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/undelete', methods=['POST'])
 def undelete():
     joke = int(request.form['id'])
-    page = request.form['redirpage']
     if not db().mayModifyJoke(joke, userid()):
         abort(403)
     db().unvoteJoke(joke, userid())
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/login', methods=['POST'])
 def login():
@@ -404,8 +397,7 @@ def login():
     if res >= 0:
         session['userlogin'] = name
         flash('Erfolgreich eingeloggt.')
-    page = request.form['redirpage']
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/logout', methods=['POST'])
 def logout():
@@ -413,8 +405,7 @@ def logout():
         del session['userlogin']
         flash('Ausgeloggt.')
     session['guestlogin'] = os.urandom(32).hex()
-    page = request.form['redirpage']
-    return redirect('/page/' + page)
+    return redirect(request.referrer)
 
 @app.route('/export')
 def export():
diff --git a/templates/index.html b/templates/index.html
index b1ca470..b249aef 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,12 +18,10 @@
                 <a class="btn-floating btn-large right" href="/export"><i class="material-icons">file_download</i></a>
                 {% if user.loggedin %}
                 <form action="/logout" method="post">
-                    <input type="hidden" name="redirpage" value="{{ currentpage }}">
                     <button class="btn" type="submit">Logout ({{ user.name }})</button>
                 </form>
                 {% else %}
                 <form action="/login" method="post">
-                    <input type="hidden" name="redirpage" value="{{ currentpage }}">
                     <div class="col s6 m4 l3 input-field">
                         <label for="user">Benutzer</label>
                         <input type="text" name="user">
@@ -59,21 +57,18 @@
                         </div>
                         <form action="/upvote" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button class="btn{% if joke.reports>0 %}-flat{% endif %}{% if joke.upvoted %} disabled{% endif %}" type="submit" style="width: 100%;">
                                 <i class="material-icons">thumb_up</i>
                             </button>
                         </form>
                         <form action="/downvote" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button class="btn{% if joke.reports>0 %}-flat{% endif %}{% if joke.downvoted %} disabled{% endif %}" type="submit" style="width: 100%;">
                                 <i class="material-icons">thumb_down</i>
                             </button>
                         </form>
                         <form action="/report" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button class="col s12 btn-flat{% if joke.reported %} disabled{% endif %}" type="submit">
                                 <i class="material-icons left">report_problem</i>
                                 <span class="right red-text">{{ joke.reports }}</span>
@@ -82,7 +77,6 @@
                         {% else %}
                         <form action="/undelete" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button class="btn-flat" type="submit" style="width: 100%;">
                                 <i class="material-icons">delete undo</i>
                             </button>
@@ -93,7 +87,6 @@
                         {% if joke.mine %}
                         <form action="/edit" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button type="button" class="btn-floating right blue noteditor" onclick="openEditor(this)"><i class="material-icons">edit</i></button>
                             <div class="input-field hide editor">
                                 <label for="text">Spruch bearbeiten</label>
@@ -108,7 +101,6 @@
                         {% if joke.mine and not joke.deleted %}
                         <form action="/delete" method="post">
                             <input type="hidden" name="id" value="{{ joke.id }}">
-                            <input type="hidden" name="redirpage" value="{{ currentpage }}">
                             <button class="btn-floating right red noteditor" type="submit"><i class="material-icons">delete</i></button>
                         </form>
                         {% endif %}
@@ -128,7 +120,6 @@
             <div class="divider"></div>
             <div class="section">
                 <form action="/submit" method="post">
-                    <input type="hidden" name="redirpage" value="{{ currentpage }}">
                     <div class="row">
                         <div class="col s12 m9 input-field">
                             <label for="text">Neuen Spruch hinzufügen</label>
-- 
cgit v1.3.1