from contextlib import closing
import locale
locale.setlocale(locale.LC_ALL, '')
+import hashlib
DATABASE = '/tmp/cavote.db'
SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
# Login / Logout
def valid_login(username, password):
- return query_db('select * from users where email = ? and password = ?', [username, password], one=True)
+ return query_db('select * from users where email = ? and password = ?', [username, crypt(password)], one=True)
def connect_user(user):
- session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade…
- #session['user']['id'] = user['id']
- #session['user']['name'] = user['name']
- #session['user']['email'] = user['email']
- #session['user']['organization'] = user['organization']
- #if user['is_admin'] == 1:
- # session['user']['is_admin'] = True
+ session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade
+ del session['user']['password']
+ del session['user']['key']
def disconnect_user():
session.pop('user', None)
+def crypt(passwd):
+ return hashlib.sha1(passwd).hexdigest()
+
@app.route('/login', methods=['GET', 'POST'])
def login():
if request.method == 'POST':
if user is None:
flash('Cet utilisateur n\'existe pas !', 'error')
else:
- # :TODO:maethor:120528: Générer la clé, la mettre dans la base de données et envoyer le mail
+ # :TODO:maethor:120528: Generer la cle, la mettre dans la base de données et envoyer le mail
flash(u"Un mail a été envoyé à " + user['email'], 'info')
return render_template('password_lost.html')
# User settings
@app.route('/user/<userid>')
-def show_user(userid):
+def user(userid):
if int(userid) != session.get('user').get('id'):
abort(401)
- return render_template('show_user.html')
+ groups = query_db('select * from roles join user_role on id=id_role where id_user = ?', userid)
+ return render_template('user.html', groups=groups)
@app.route('/user/settings/<userid>', methods=['GET', 'POST'])
-def user_settings(userid):
+def user_edit(userid):
if int(userid) != session.get('user').get('id'):
abort(401)
if request.method == 'POST':
- 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.commit()
- disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D
- flash(u'Votre profil a été mis à jour !', 'success')
- return redirect(url_for('login'))
- return render_template('user_settings.html')
+ 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.commit()
+ disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D
+ user = query_db('select * from users where id=?', [userid], one=True)
+ if user is None:
+ flash(u'Une erreur s\'est produite.', 'error')
+ return redirect(url_for('login'))
+ connect_user(user)
+ flash(u'Votre profil a été mis à jour !', 'success')
+ else:
+ flash(u'Le nom ' + request.form['name'] + u' est déjà pris ! Veuillez en choisir un autre.', 'error')
+ else:
+ flash(u'Il existe déjà un compte pour cette adresse e-mail : ' + request.form['email'], 'error')
+ return render_template('user_edit.html')
@app.route('/user/password/<userid>', methods=['GET', 'POST'])
def user_password(userid):
abort(401)
if request.method == 'POST':
if request.form['password'] == request.form['password2']:
- # :TODO:maethor:120528: Chiffrer le mot de passe !
- g.db.execute('update users set password = ? where id = ?', [request.form['password'], session['user']['id']])
+ g.db.execute('update users set password = ? where id = ?', [crypt(request.form['password']), session['user']['id']])
g.db.commit()
flash(u'Votre mot de passe a été mis à jour.', 'success')
else:
flash(u'Les mots de passe sont différents.', 'error')
- return render_template('user_settings.html')
+ return render_template('user_edit.html')
#------------
# User admin
-@app.route('/users/admin/list')
+@app.route('/admin/users')
def admin_users():
if not session.get('user').get('is_admin'):
abort(401)
- users = query_db('select * from users order by id desc')
+ users = query_db('select *, roles.name as rolename from (select *, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+ # :TODO:maethor:20120530: Find a way to reduce the dict
return render_template('admin_users.html', users=users)
-@app.route('/users/admin/add', methods=['GET', 'POST'])
-def add_user():
+@app.route('/admin/users/add', methods=['GET', 'POST'])
+def admin_user_add():
if not session.get('user').get('is_admin'):
abort(401)
if request.method == 'POST':
g.db.execute('insert into users (email, name, organization, password, is_admin) values (?, ?, ?, ?, ?)',
[request.form['email'], request.form['username'], request.form['organization'], password, admin])
g.db.commit()
- # :TODO:maethor:120528: Send mail
- flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
- return redirect(url_for('home'))
+ user = query_db('select * from users where email = ?', [request.form["email"]], one=True)
+ if user:
+ for role in request.form.getlist('roles'):
+ # :TODO:maethor:120528: Check if this role exist
+ if query_db('select id from roles where id = ?', role, one=True) is None:
+ abort(401)
+ g.db.execute('insert into user_role values (?, ?)', [user['id'], role])
+ g.db.commit()
+ # :TODO:maethor:120528: Send mail
+ flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
+ return redirect(url_for('admin_users'))
+ else:
+ flash(u'Une erreur s\'est produite.', 'error')
else:
flash(u"Vous devez spécifier une adresse email.", 'error')
- return render_template('add_user.html')
+ groups = query_db('select * from roles where system=0')
+ return render_template('admin_user_new.html', groups=groups)
#-------------
# Roles admin
-@app.route('/roles')
-def show_roles():
+@app.route('/admin/roles')
+def admin_roles():
if not session.get('user').get('is_admin'):
abort(401)
roles = query_db('select * from roles')
- return render_template('show_roles.html', roles=roles)
+ return render_template('admin_roles.html', roles=roles)
-@app.route('/roles/admin/add', methods=['POST'])
-def add_role():
+@app.route('/admin/roles/add', methods=['POST'])
+def admin_role_add():
if not session.get('user').get('is_admin'):
abort(401)
if request.method == 'POST':
g.db.commit()
else:
flash(u"Vous devez spécifier un nom.", "error")
- return redirect(url_for('show_roles'))
+ return redirect(url_for('admin_roles'))
-@app.route('/roles/admin/delete/<idrole>')
-def del_role(idrole):
+@app.route('/admin/roles/delete/<idrole>')
+def admin_role_del(idrole):
if not session.get('user').get('is_admin'):
abort(401)
role = query_db('select * from roles where id = ?', [idrole], one=True)
abort(401)
g.db.execute('delete from roles where id = ?', [idrole])
g.db.commit()
- return redirect(url_for('show_roles'))
+ return redirect(url_for('admin_roles'))
#------------
# Votes list
@app.route('/votes/<votes>')
-def show_votes(votes):
+def votes(votes):
today = date.today()
active_button = votes
- basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where open=1'
+ basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where is_open=1'
if votes == 'all':
votes = query_db(basequery + ' order by id desc')
elif votes == 'archive':
votes = query_db(basequery + ' and date_end >= (?) order by id desc', [today])
else:
abort(404)
- return render_template('show_votes.html', votes=votes, active_button=active_button)
+ return render_template('votes.html', votes=votes, active_button=active_button)
#------
# Vote
return True # :TODO:maethor:20120529: Check others things
@app.route('/vote/<idvote>')
-def show_vote(idvote):
+def vote(idvote):
vote = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where votes.id=?', [idvote], one=True)
if vote is None:
abort(404)
#-------------
# Votes admin
-@app.route('/votes/admin/list')
+@app.route('/admin/votes/list')
def admin_votes():
if not session.get('user').get('is_admin'):
abort(401)
votes = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role order by id desc')
return render_template('admin_votes.html', votes=votes)
-@app.route('/votes/admin/add', methods=['GET', 'POST'])
-def add_vote():
+@app.route('/admin/votes/add', methods=['GET', 'POST'])
+def admin_vote_add():
if not session.get('user').get('is_admin'):
abort(401)
if request.method == 'POST':
return redirect(url_for('home'))
else:
flash(u"Le vote a été créé", 'info')
- return redirect(url_for('edit_vote', voteid=vote['id']))
+ return redirect(url_for('admin_vote_edit', voteid=vote['id']))
else:
flash(u'Vous devez spécifier un titre.', 'error')
groups = query_db('select * from roles')
- return render_template('new_vote.html', groups=groups)
+ return render_template('admin_vote_new.html', groups=groups)
-@app.route('/votes/admin/edit/<voteid>', methods=['GET', 'POST'])
-def edit_vote(voteid):
+@app.route('/admin/votes/edit/<voteid>', methods=['GET', 'POST'])
+def admin_vote_edit(voteid):
if not session.get('user').get('is_admin'):
abort(401)
vote = query_db('select * from votes where id = ?', [voteid], one=True)
vote['duration'] = 15
group = query_db('select name from roles where id = ?', [vote['id_role']], one=True)
choices = query_db('select * from choices where id_vote = ?', [voteid])
- return render_template('edit_vote.html', vote=vote, group=group, choices=choices)
+ return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices)
-@app.route('/votes/admin/addchoice/<voteid>', methods=['POST'])
-def add_choice(voteid):
+@app.route('/admin/votes/addchoice/<voteid>', methods=['POST'])
+def admin_vote_addchoice(voteid):
if not session.get('user').get('is_admin'):
abort(401)
vote = query_db('select * from votes where id = ?', [voteid], one=True)
abort(404)
g.db.execute('insert into choices (name, id_vote) values (?, ?)', [request.form['title'], voteid])
g.db.commit()
- return redirect(url_for('edit_vote', voteid=voteid))
+ return redirect(url_for('admin_vote_edit', voteid=voteid))
-@app.route('/votes/admin/editchoice/<voteid>/<choiceid>', methods=['POST', 'DELETE'])
-def edit_choice(voteid, choiceid):
+@app.route('/admin/votes/editchoice/<voteid>/<choiceid>', methods=['POST', 'DELETE'])
+def admin_vote_editchoice(voteid, choiceid):
if not session.get('user').get('is_admin'):
abort(401)
choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True)
elif request.method == 'DELETE': # :COMMENT:maethor:20120528: I can't find how to use it from template
g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid])
g.db.commt()
- return redirect(url_for('edit_vote', voteid=voteid))
+ return redirect(url_for('admin_vote_edit', voteid=voteid))
-@app.route('/votes/admin/deletechoice/<voteid>/<choiceid>')
-def delete_choice(voteid, choiceid):
+@app.route('/admin/votes/deletechoice/<voteid>/<choiceid>')
+def admin_vote_deletechoice(voteid, choiceid):
if not session.get('user').get('is_admin'):
abort(401)
choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True)
abort(404)
g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid])
g.db.commit()
- return redirect(url_for('edit_vote', voteid=voteid))
+ return redirect(url_for('admin_vote_edit', voteid=voteid))
#------
# Main
dépôts / cavote.git / blobdiff