|
|
@@ -89,17 +89,17 @@ def login():
|
|
|
if request.method == 'POST':
|
|
|
user = valid_login(request.form['username'], request.form['password'])
|
|
|
if user is None:
|
|
|
- flash('Invalid username/password', 'error')
|
|
|
+ flash('Email ou mot de passe invalide.', 'error')
|
|
|
else:
|
|
|
connect_user(user)
|
|
|
- flash('You were logged in', 'success')
|
|
|
+ flash(u'Vous êtes connecté. Bienvenue, %s !' % user['name'], 'success')
|
|
|
return redirect(url_for('home'))
|
|
|
return render_template('login.html')
|
|
|
|
|
|
@app.route('/logout')
|
|
|
def logout():
|
|
|
disconnect_user()
|
|
|
- flash('You were logged out', 'info')
|
|
|
+ flash('Vous avez été déconnecté.', 'info')
|
|
|
return redirect(url_for('home'))
|
|
|
|
|
|
#-----------------
|
|
|
@@ -228,26 +228,45 @@ def admin_user_add():
|
|
|
if query_db('select * from users where email=?', [request.form['email']], one=True) is None:
|
|
|
if request.form['username']:
|
|
|
if query_db('select * from users where name=?', [request.form['username']], one=True) is None:
|
|
|
- # :TODO:maethor:120528: Check fields
|
|
|
- password = "toto" # :TODO:maethor:120528: Generate password
|
|
|
+ password = keygen()
|
|
|
admin = 0
|
|
|
if 'admin' in request.form.keys():
|
|
|
admin = 1
|
|
|
- g.db.execute('insert into users (email, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, "invalid")',
|
|
|
- [request.form['email'], request.form['username'], request.form['organization'], password, admin])
|
|
|
+ key = keygen()
|
|
|
+ g.db.execute('insert into users (email, name, organization, password, is_admin, key) values (?, ?, ?, ?, ?, ?)',
|
|
|
+ [request.form['email'], request.form['username'], request.form['organization'], password, admin, key])
|
|
|
g.db.commit()
|
|
|
user = query_db('select * from users where email = ?', [request.form["email"]], one=True)
|
|
|
if user:
|
|
|
- groups = request.form.getlist('groups')
|
|
|
- groups.append('1')
|
|
|
- for group in groups:
|
|
|
- if query_db('select id from groups where id = ?', group, one=True) is None:
|
|
|
- abort(401)
|
|
|
- g.db.execute('insert into user_group values (?, ?)', [user['id'], group])
|
|
|
- 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'))
|
|
|
+ groups = request.form.getlist('groups')
|
|
|
+ groups.append('1')
|
|
|
+ for group in groups:
|
|
|
+ if query_db('select id from groups where id = ?', group, one=True) is None:
|
|
|
+ flash(u'Le groupe portant l\'id %s n\'existe pas.' % group, 'warning')
|
|
|
+ else:
|
|
|
+ g.db.execute('insert into user_group values (?, ?)', [user['id'], group])
|
|
|
+ g.db.commit()
|
|
|
+ link = BASEURL + url_for('login_key', userid=user['id'], key=user['key'])
|
|
|
+ BODY = string.join((
|
|
|
+ "From: %s" % EMAIL,
|
|
|
+ "To: %s" % user['email'],
|
|
|
+ "Subject: [Cavote] Welcome",
|
|
|
+ "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
|
|
|
+ "X-Mailer: %s" % VERSION,
|
|
|
+ "",
|
|
|
+ "Hi %s!" % user['name'],
|
|
|
+ "Welcome on %s." % TITLE,
|
|
|
+ "Your account's adresse is : %s." % user['email'],
|
|
|
+ "",
|
|
|
+ "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.quit()
|
|
|
+ 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:
|
Guillaume Subiron