Print groups in user list

[cavote.git] / main.py

diff --git a/main.py b/main.py
index 9556f96..735fa6d 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -8,6 +8,7 @@ from datetime import date, timedelta
 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=+:'
@@ -47,20 +48,19 @@ def init_db():
 # 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
+    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':
@@ -144,8 +144,7 @@ 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:
@@ -159,8 +158,19 @@ def user_password(userid):
 def admin_users():
     if not session.get('user').get('is_admin'):
         abort(401)
-    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
+    tuples = query_db('select *, roles.name as rolename from (select *, id as userid, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+    users = dict()
+    for t in tuples:
+        if t['userid'] in users:
+            users[t['userid']]['roles'].append(t["rolename"])
+        else:
+            users[t['userid']] = dict()
+            users[t['userid']]['userid'] = t['userid']
+            users[t['userid']]['email'] = t['email']
+            users[t['userid']]['username'] = t['username']
+            users[t['userid']]['is_admin'] = t['is_admin']
+            users[t['userid']]['roles'] = [t['rolename']]
+
     return render_template('admin_users.html', users=users)
 
 @app.route('/admin/users/add', methods=['GET', 'POST'])