diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index 891a543..3aa5959 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -109,7 +109,7 @@ ${ligne.classe} ${ligne.libelle} - ${ligne.libelle} + ${ligne.libelle} ${layout.to_euro(ligne.cours)} ${ligne.nombre} ${layout.to_euro(ligne.valeur)} diff --git a/caotek_mesavoirs/views/members.py b/caotek_mesavoirs/views/members.py index 03b6d33..69f613c 100644 --- a/caotek_mesavoirs/views/members.py +++ b/caotek_mesavoirs/views/members.py @@ -29,6 +29,9 @@ from ..views.default import ( envoyerMail, ) +def to_sha1(message): + return hashlib.sha1(message.encode('utf-8')).hexdigest() + @view_config(route_name='envoyer_mdp', renderer='../templates/members/envoyer_mdp.pt') def envoyer_mdp(request): url = request.route_url('envoyer_mdp') @@ -76,7 +79,7 @@ def changer_mdp(request): if 'form.submitted' in request.params: old_password = request.params['old_password'] new_password = request.params['new_password1'] - if member.mdp == hashlib.sha1(old_password).hexdigest(): + if member.mdp == to_sha1(old_password): update_membre_mdp(request, logged_in, new_password) request.session.flash(u"Votre mot de passe a été mis à jour avec succès.") return HTTPFound(location=request.route_url('home')) @@ -138,7 +141,7 @@ def login(request): record = get_member_by_email(request, login) if record : # mot de passe hash valide ? - if record.mdp == hashlib.sha1(password).hexdigest(): + if record.mdp == to_sha1(old_password): update_last_connection(request, login) # force le commit car il ne se fait pas automatiquement après l'update transaction.commit() diff --git a/setup.py b/setup.py index 1f52d2a..ac9a64b 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ requires = [ 'waitress', 'MySQL-python', # 'mysql-connector-python', - 'BeautifulSoup', + 'beautifulsoup4', ] tests_require = [