dépôts
/
cavote.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c19321
)
Fix issue when generating email (unicode decoding)
author
Arnaud Delcasse
<arnaud@delcasse.fr>
Sat, 18 Aug 2012 16:51:23 +0000
(18:51 +0200)
committer
Arnaud Delcasse
<arnaud@delcasse.fr>
Sat, 18 Aug 2012 16:51:23 +0000
(18:51 +0200)
main.py
patch
|
blob
|
history
diff --git
a/main.py
b/main.py
index
956e438
..
3fcc5ae
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-124,7
+124,7
@@
def password_lost():
"From: %s" % EMAIL,
"To: %s" % user['email'],
"Subject: [Cavote] Password lost",
"From: %s" % EMAIL,
"To: %s" % user['email'],
"Subject: [Cavote] Password lost",
- "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
+ "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())
.decode('utf-8')
,
"X-Mailer: %s" % VERSION,
"",
"You have lost your password.",
"X-Mailer: %s" % VERSION,
"",
"You have lost your password.",
@@
-135,7
+135,7
@@
def password_lost():
link,
"",
"If you think this mail is not for you, please ignore and delete it."
link,
"",
"If you think this mail is not for you, please ignore and delete it."
- ), "\
r\
n")
+ ), "\n")
server = smtplib.SMTP(SMTP_SERVER)
server.sendmail(EMAIL, [user['email']], BODY)
server.quit()
server = smtplib.SMTP(SMTP_SERVER)
server.sendmail(EMAIL, [user['email']], BODY)
server.quit()
@@
-254,7
+254,7
@@
def admin_user_add():
"From: %s" % EMAIL,
"To: %s" % user['email'],
"Subject: [Cavote] Welcome",
"From: %s" % EMAIL,
"To: %s" % user['email'],
"Subject: [Cavote] Welcome",
- "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()),
+ "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime())
.decode('utf-8')
,
"X-Mailer: %s" % VERSION,
"",
"Hi %s!" % user['name'],
"X-Mailer: %s" % VERSION,
"",
"Hi %s!" % user['name'],
@@
-264,7
+264,7
@@
def admin_user_add():
"To log in for the first time and set your password, please follow this link :",
link,
""
"To log in for the first time and set your password, please follow this link :",
link,
""
- ), "\
r\
n")
+ ), "\n")
server = smtplib.SMTP(SMTP_SERVER)
server.sendmail(EMAIL, [user['email']], BODY)
server.quit()
server = smtplib.SMTP(SMTP_SERVER)
server.sendmail(EMAIL, [user['email']], BODY)
server.quit()