fix missing openid lib on wheezy

[cavote.git] / main.py

diff --git a/main.py b/main.py
index 0d673e5..f68658b 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -3,8 +3,9 @@
 
 from flask import Flask, request, session, g, redirect, url_for, abort, \
     render_template, flash
-from flask_openid import OpenID
-from flaskext.babel import Babel, gettext, ngettext
+from gettext import gettext
+#from flask_openid import OpenID
+#from flaskext.babel import Babel, gettext, ngettext
 import sqlite3
 from datetime import date, time, timedelta, datetime
 import time
@@ -21,8 +22,8 @@ from settings import *
 app = Flask(__name__)
 app.config.from_object(__name__)
 
-oid = OpenID(app)
-babel = Babel(app)
+#oid = OpenID(app)
+#babel = Babel(app)
 
 def connect_db():
     return sqlite3.connect(app.config['DATABASE'])
@@ -467,15 +468,17 @@ def vote(idvote):
     if vote is None:
         abort(404)
     if can_see_vote(idvote, get_userid()):
+        choices = query_db('select name, id from choices where id_vote=?', [idvote])
         if request.method == 'POST':
             if can_vote(idvote, get_userid()):
                 if vote['is_multiplechoice'] == 0:
-                    if query_db('select * from choices where id = ?', [request.form['choice']], one=True) is not None:
-                        g.db.execute('insert into user_choice (id_user, id_choice) values (?, ?)', 
-                                [session.get('user').get('id'), request.form['choice']])
+                    choice = request.form['choice']
+                    if choice in [str(c['id']) for c in choices] \
+                        and query_db('select * from choices where id = ?', [choice], one=True) is not None:
+                        g.db.execute('insert into user_choice (id_user, id_choice) values (?, ?)',
+                        [session.get('user').get('id'), request.form['choice']])
                         g.db.commit()
                 else:
-                    choices = query_db('select name, id from choices where id_vote=?', [idvote])
                     for choice in choices:
                         if str(choice['id']) in request.form.keys():
                             g.db.execute('insert into user_choice (id_user, id_choice) values (?, ?)',