X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=d56e2510b30ea3760bbe0bf3f404c3cdd71a5d52;hb=e82173a1eb29048c63c08e16acfd6cbda5b40bb8;hp=50a84523c246a51252238da98e7f2f39325f7946;hpb=60271c55794551243f01b9e638fb5553aa46fc47;p=cavote.git

diff --git a/main.py b/main.py
index 50a8452..d56e251 100755
--- a/main.py
+++ b/main.py
@@ -3,6 +3,7 @@
 
 from flask import Flask, request, session, g, redirect, url_for, abort, \
     render_template, flash
+from flaskext.openid import OpenID
 import sqlite3
 from datetime import date, time, timedelta, datetime
 import time
@@ -20,13 +21,15 @@ SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
 DEBUG = True
 TITLE = u"Cavote FFDN"
 EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
-VERSION = "cavote 0.1.1"
-SMTP_SERVER = "10.33.33.30"
+VERSION = "cavote 0.2.0"
+SMTP_SERVER = "127.0.0.1"
 PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
 
 app = Flask(__name__)
 app.config.from_object(__name__)
 
+oid = OpenID(app)
+
 def connect_db():
     return sqlite3.connect(app.config['DATABASE'])
 
@@ -98,11 +101,15 @@ def get_userid():
         return user.get('id')
 
 @app.route('/login', methods=['GET', 'POST'])
+@oid.loginhandler
 def login():
     if request.method == 'POST':
         user = valid_login(request.form['username'], request.form['password'])
         if user is None:
-            flash(u'Email ou mot de passe invalide.', 'error')
+            if request.form['openid']:
+                return oid.try_login(request.form['openid'], ask_for=['email', 'fullname', 'nickname'])
+            else:
+                flash(u'Email ou mot de passe invalide.', 'error')
         else:
             connect_user(user)
             flash(u'Vous êtes connecté. Bienvenue, %s !' % user['name'], 'success')
@@ -111,6 +118,16 @@ def login():
             return redirect(url_for('home'))
     return render_template('login.html')
 
+@oid.after_login
+def create_or_login(resp):
+    openid_url = resp.identity_url
+    user = query_db('select * from users where openid = ?', [openid_url], one=True)
+    if user is not None:
+        flash(u'Successfully signed in')
+        connect_user(user)
+        return redirect(oid.get_next_url())
+    return redirect(url_for('home'))
+
 @app.route('/logout')
 def logout():
     disconnect_user()
@@ -183,8 +200,8 @@ def user_edit(userid):
     if request.method == 'POST':
         if query_db('select * from users where email=? and id!=?', [request.form['email'], userid], one=True) is None:
             if query_db('select * from users where name=? and id!=?', [request.form['name'], userid], one=True) is None:
-                g.db.execute('update users set email = ?, name = ?, organization = ? where id = ?',
-                        [request.form['email'], request.form['name'], request.form['organization'], session['user']['id']])
+                g.db.execute('update users set email = ?, openid = ?, name = ?, organization = ? where id = ?',
+                        [request.form['email'], request.form['openid'], request.form['name'], request.form['organization'], session['user']['id']])
                 g.db.commit()
                 disconnect_user()
                 user = query_db('select * from users where id=?', [userid], one=True)
@@ -252,8 +269,9 @@ def admin_user_add():
                         if 'admin' in request.form.keys():
                             admin = 1
                         key = 'v%s' % keygen()
-                        g.db.execute('insert into users (email, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, ?)',
+                        g.db.execute('insert into users (email, openid, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, ?, ?)',
                                 [request.form['email'],
+                                    request.form['openid'],
                                     request.form['username'],
                                     request.form['organization'],
                                     '', admin, key])
@@ -316,8 +334,8 @@ def admin_user_edit(iduser):
                 admin = 0
                 if 'admin' in request.form.keys():
                     admin = 1
-                g.db.execute('update users set email = ?, name = ?, organization = ?, is_admin = ? where id = ?',
-                        [request.form['email'], request.form['name'], request.form['organization'], admin, iduser])
+                g.db.execute('update users set email = ?, name = ?, organization = ?, openid= ?, is_admin = ? where id = ?',
+                        [request.form['email'], request.form['name'], request.form['organization'], request.form['openid'], admin, iduser])
                 g.db.commit()
                 groups = request.form.getlist('groups')
                 groups.append('1')
@@ -400,7 +418,7 @@ def votes(votes):
     basequery = 'select votes.*, max_votes from votes left join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group'
     nb_votes = 'select id_vote, count(*) as nb_votes from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) group by id_vote'
     basequery = 'select * from (' + basequery + ') left join (' + nb_votes + ') on id = id_vote'
-    basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1'
+    basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1 and is_hidden=0'
     if votes == 'all':
         votes = query_db(basequery + ' order by date_end')
     elif votes == 'archive':
@@ -517,7 +535,7 @@ def vote_deletechoices(idvote, iduser):
 def admin_votes():
     if not session.get('user').get('is_admin'):
         abort(401)
-    votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group order by id desc')
+    votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group where is_hidden=0 order by id desc')
     return render_template('admin_votes.html', votes=votes, today=date.today().strftime("%Y-%m-%d"))
 
 @app.route('/admin/votes/add', methods=['GET', 'POST'])
@@ -610,6 +628,17 @@ def admin_vote_edit(voteid):
         flash(u'La deadline du vote est expirée, vous devriez terminer le vote.')
     return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices, attachments=attachments)
 
+@app.route('/admin/votes/delete/<idvote>')
+def admin_vote_del(idvote):
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    vote = query_db('select * from votes where id = ?', [idvote], one=True)
+    if vote is None:
+        abort(404)
+    g.db.execute('update votes set is_hidden=1 where id = ?', [idvote])
+    g.db.commit()
+    return redirect(url_for('admin_votes'))
+
 @app.route('/admin/votes/addchoice/<voteid>', methods=['POST'])
 def admin_vote_addchoice(voteid):
     if not session.get('user').get('is_admin'):