X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=blobdiff_plain;f=main.py;h=da8431c5a56381e9a00a02632fe8cfee2abd8ff8;hp=5cc7e32121ef4c50074a36ca51c4400d49292365;hb=5214a40c479b78efea032f35accf1b3669e6428d;hpb=fb7df37a905695b55bd5a1ca911219879b3b6171 diff --git a/main.py b/main.py index 5cc7e32..da8431c 100755 --- a/main.py +++ b/main.py @@ -3,7 +3,8 @@ from flask import Flask, request, session, g, redirect, url_for, abort, \ render_template, flash -from flaskext.openid import OpenID +from flask_openid import OpenID +from flaskext.babel import Babel, gettext, ngettext import sqlite3 from datetime import date, time, timedelta, datetime import time @@ -17,10 +18,11 @@ import string from settings import * -app = Flask(__name__) +app = Flask(__name__) app.config.from_object(__name__) oid = OpenID(app) +babel = Babel(app) def connect_db(): return sqlite3.connect(app.config['DATABASE']) @@ -115,7 +117,7 @@ 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') + flash(gettext(u'Successfully signed in')) connect_user(user) return redirect(oid.get_next_url()) return redirect(url_for('home')) @@ -146,21 +148,21 @@ def password_lost(): BODY = string.join(( "From: %s" % EMAIL, "To: %s" % user['email'], - "Subject: [Cavote] Password lost", + "Subject: [Cavote] %s" % gettext(u"Lost password"), "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "X-Mailer: %s" % VERSION, "", - "You have lost your password.", - "This link will log you without password.", - "Don't forget to define a new one as soon a possible!", - "This link will only work one time.", + gettext(u"It seems that you have lost your password."), + gettext(u"This link will log you without password."), + gettext(u"Don't forget to define a new one as soon a possible!"), + gettext(u"This link will only work one time."), "", link, "", - "If you think this mail is not for you, please ignore and delete it." + gettext(u"If you think this mail is not for you, please ignore and delete it.") ), "\r\n") server = smtplib.SMTP(SMTP_SERVER) - server.sendmail(EMAIL, [user['email']], BODY) + server.sendmail(EMAIL, [user['email']], BODY.encode('utf-8')) server.quit() flash(u"Un mail a été envoyé à " + user['email'], 'info') return render_template('password_lost.html') @@ -182,7 +184,7 @@ def login_key(userid, key): def user(userid): if int(userid) != get_userid(): abort(401) - groups = query_db('select * from groups join user_group on id=id_group where id_user = ?', userid) + groups = query_db('select * from groups join user_group on id=id_group where id_user = ?', (userid,)) return render_template('user.html', groups=groups) @app.route('/user/settings/', methods=['GET', 'POST']) @@ -217,9 +219,7 @@ def user_password(userid): # new (invalid) key key = 'i%s' % keygen() # start with i: invalid key print "\n\nchange key for %s\n" % key # FIXME TMP - g.db.execute('update users set password = ?, key = ? where id = ?', - [crypt(request.form['password'], key), - key, session['user']['id']]) + g.db.execute('update users set password = ?, key = ? where id = ?', [crypt(request.form['password'], key), key, session['user']['id']]) g.db.commit() flash(u'Votre mot de passe a été mis à jour.', 'success') else: @@ -282,20 +282,20 @@ def admin_user_add(): BODY = string.join(( "From: %s" % EMAIL, "To: %s" % user['email'], - "Subject: [Cavote] Welcome", + "Subject: [Cavote] %s" % gettext(u"Welcome"), "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "X-Mailer: %s" % VERSION, "", - "Hi %s!" % user['name'], - "Welcome on %s." % TITLE, - "Your account's adresse is : %s." % user['email'], + "%(text)s %(user)s!" % {"text": gettext(u"Hi"), "user": user['name']}, + "%(text2)s %(title)s." % {"text2": gettext(u"Welcome on"), "title": TITLE}, + "%(text3)s %(email)s." % {"text3": gettext(u"Your account address is"), "email": user['email']}, "", - "To log in for the first time and set your password, please follow this link :", + gettext(u"To log in for the first time and set your password, please follow this link :"), link, "" ), "\r\n") server = smtplib.SMTP(SMTP_SERVER) - server.sendmail(EMAIL, [user['email']], BODY) + server.sendmail(EMAIL, [user['email']], BODY.encode('utf-8')) server.quit() flash(u'Le nouvel utilisateur a été créé avec succès', 'success') return redirect(url_for('admin_users')) @@ -410,7 +410,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': @@ -527,7 +527,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']) @@ -598,21 +598,41 @@ def admin_vote_edit(voteid): choices = query_db('select id_vote, count(*) as nb from choices where id_vote = ? group by id_vote', [voteid], one=True) if choices is not None and choices['nb'] >= 2: isopen = 1 + previousvote = query_db('select id, is_open, id_group from votes where id = ?', [voteid], one=True) + if previousvote is None or previousvote['is_open'] == 0: + users_to_vote = query_db('select users.email, users.name from users join user_group on users.id=user_group.id_user where user_group.id_group = ?', [previousvote['id_group']]) + for user in users_to_vote: + link = request.url_root + url_for('vote', idvote=voteid) + BODY = string.join(( + "From: %s" % EMAIL, + "To: %s" % user['email'], + "Subject: [Cavote] %s" % gettext(u"A vote has been opened for your group"), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), + "X-Mailer: %s" % VERSION, + "", + "%(text)s %(title)s" % {"text": gettext(u"A vote has been opened and you are in a group concerned by it :"), "title": request.form['title']}, + "", + gettext(u"This link will bring you to the form where you will be able to vote :"), + link, + "", + gettext(u"If you think this mail is not for you, please ignore and delete it.") + ), "\r\n") + server = smtplib.SMTP(SMTP_SERVER) + server.sendmail(EMAIL, [user['email']], BODY.encode('utf-8')) + server.quit() else: flash(u'Vous devez proposer au moins deux choix pour ouvrir le vote.', 'error') elif request.form['status'] == u'Terminé': isterminated = 1 if vote['is_open']: isopen = 1 - g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ?, date_end = ? where id = ?', - [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, date_end, voteid]) + g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ?, date_end = ?, reminder_last_days = ? where id = ?', [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, date_end, request.form['reminder'], voteid]) g.db.commit() vote = query_db('select * from votes where id = ?', [voteid], one=True) flash(u"Le vote a bien été mis à jour.", "success") else: flash(u'Vous devez spécifier un titre.', 'error') - vote['duration'] = (datetime.strptime(vote['date_end'], "%Y-%m-%d") - - datetime.strptime(vote['date_begin'], "%Y-%m-%d")).days + vote['duration'] = (datetime.strptime(vote['date_end'], "%Y-%m-%d") - datetime.strptime(vote['date_begin'], "%Y-%m-%d")).days group = query_db('select name from groups where id = ?', [vote['id_group']], one=True) choices = query_db('select * from choices where id_vote = ?', [voteid]) attachments = query_db('select * from attachments where id_vote = ?', [voteid]) @@ -620,6 +640,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/') +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/', methods=['POST']) def admin_vote_addchoice(voteid): if not session.get('user').get('is_admin'): @@ -686,4 +717,3 @@ def admin_vote_deleteattachment(voteid, attachmentid): if __name__ == '__main__': app.run() -