Remove logged_in variable

[cavote.git] / main.py

diff --git a/main.py b/main.py
index ea1179e..77310af 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -36,31 +36,37 @@ def home():
 #----------------
 # Login / Logout
 
+def valid_login(username, password):
+    return username == app.config['USERNAME'] and password == app.config['PASSWORD']
+
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     error = None
     if request.method == 'POST':
-        if request.form['username'] != app.config['USERNAME']:
-            error = 'Invalid username'
-        elif request.form['password'] != app.config['PASSWORD']:
-            error = 'Invalid password'
-        else:
-            session['logged_in'] = True
-            session['nickname'] = request.form['username']
-            if session['nickname'] == 'admin':
+        if valid_login(request.form['username'], request.form['password']):
+            session['username'] = request.form['username']
+            if session['username'] == 'admin':
                 session['is_admin'] = True
             flash('You were logged in')
             return redirect(url_for('home'))
+        else:
+            error = "Invalid username/password"
     return render_template('login.html', error=error)
 
 @app.route('/logout')
 def logout():
-    session.pop('logged_in', None)
+    session.pop('username', None)
+    session.pop('is_admin', None)
     flash('You were logged out')
     return redirect(url_for('home'))
 
 #---------------
 # User settings
+@app.route('/user/settings/<username>')
+def show_settings(username):
+    if username != session['username']:
+        abort(401)
+
 
 #------------
 # User admin
@@ -71,13 +77,13 @@ def logout():
 
 @app.route('/votes/<votes>')
 def show_votes(votes):
-    today = date.today().strftime('%d %B %Y')
+    today = date.today()
     if votes == 'all':
         cur = g.db.execute('select title, description, date_begin, date_end from votes order by id desc')
     elif votes == 'archives':
-        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end < :today order by id desc', {"today" : today})
+        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end < (?) order by id desc', [today])
     elif votes == 'currently':
-        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end > :today order by id desc', {"today" : today})
+        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end >= (?) order by id desc', [today])
     else:
         abort(404)
     votes = [dict(title=row[0], description=row[1], date_begin=row[2], date_end=row[3], 
@@ -89,16 +95,16 @@ def show_votes(votes):
 
 @app.route('/votes/admin/new')
 def new_vote():
-    if not session.get('logged_in'):
+    if not session.get('is_admin'):
         abort(401)
     return render_template('new_vote.html')
 
 @app.route('/votes/admin/add', methods=['POST'])
 def add_vote():
-    if not session.get('logged_in'):
+    if not session.get('is_admin'):
         abort(401)
-    daten = date.today() + timedelta(days=int(request.form['days']))
-    ndate = daten.strftime('%d %B %Y')
+    date_begin = date.today()
+    date_end = date.today() + timedelta(days=int(request.form['days']))
     transparent = 0
     public = 0
     multiplechoice = 0
@@ -108,8 +114,8 @@ def add_vote():
         public = 1
     if 'multiplechoice' in request.form.keys():
         multiplechoice = 1
-    g.db.execute('insert into votes (title, description, date_end, is_transparent, is_public, is_multiplechoice) values (?, ?, ?, ?, ?, ?)',
-            [request.form['title'], request.form['description'], ndate, transparent, public, multiplechoice])
+    g.db.execute('insert into votes (title, description, date_begin, date_end, is_transparent, is_public, is_multiplechoice) values (?, ?, ?, ?, ?, ?, ?)',
+            [request.form['title'], request.form['description'], date_begin, date_end, transparent, public, multiplechoice])
     g.db.commit()
     flash('New entry was successfully posted')
     return redirect(url_for('home'))