X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=da9316bbf7c53a9024aea144e33ac6b432808681;hb=af86f1aa2f19d4ebb51217983eb6935befe595ed;hp=3fcc5aea3660da2c9192fa374b51c2cb3531650b;hpb=a088209db173fc2bc6017dc77e6dbbf3b10830aa;p=cavote.git

diff --git a/main.py b/main.py
index 3fcc5ae..da9316b 100755
--- a/main.py
+++ b/main.py
@@ -135,7 +135,7 @@ def password_lost():
                 link,
                 "",
                 "If you think this mail is not for you, please ignore and delete it."
-                ), "\n")
+                ), "\r\n")
             server = smtplib.SMTP(SMTP_SERVER)
             server.sendmail(EMAIL, [user['email']], BODY)
             server.quit()
@@ -264,7 +264,7 @@ def admin_user_add():
                             "To log in for the first time and set your password, please follow this link :",
                             link,
                             ""
-                            ), "\n")
+                            ), "\r\n")
                             server = smtplib.SMTP(SMTP_SERVER)
                             server.sendmail(EMAIL, [user['email']], BODY)
                             server.quit()
@@ -432,7 +432,7 @@ def has_voted(idvote, iduser=-1):
 
 @app.route('/vote/<idvote>', methods=['GET', 'POST'])
 def vote(idvote):
-    vote = query_db('select votes.*, groups.name as groupname from votes join groups on groups.id=votes.id_group where votes.id=?', [idvote], one=True)
+    vote = query_db('select votes.*, groups.name as groupname, users.name as author from votes join groups on groups.id=votes.id_group join users on users.id = id_author where votes.id=?', [idvote], one=True)
     if vote is None:
         abort(404)
     if can_see_vote(idvote, get_userid()):