[mail] Le corps est encodé dans la fonction de génération, pas besoin de le refaire
This commit is contained in:
parent
1fbcc7fc3e
commit
81eddeb0ff
2 changed files with 1 additions and 3 deletions
|
@ -76,7 +76,7 @@ for clandestin in bad_boys_e_s:
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
print mail
|
print mail
|
||||||
mailer = os.popen("/usr/sbin/sendmail -t", "w")
|
mailer = os.popen("/usr/sbin/sendmail -t", "w")
|
||||||
mailer.write(mail.encode("utf-8") + "\n.")
|
mailer.write(mail + "\n.")
|
||||||
mailer.close()
|
mailer.close()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -240,7 +240,6 @@ for elupload, eltype, elid in uploadeurs:
|
||||||
mail = connectsmtp()
|
mail = connectsmtp()
|
||||||
|
|
||||||
corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string()
|
corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string()
|
||||||
corps = corps.encode('utf-8')
|
|
||||||
mail.sendmail(upload.expediteur, proprio.email(), corps)
|
mail.sendmail(upload.expediteur, proprio.email(), corps)
|
||||||
|
|
||||||
# On envoie un mail à disconnect
|
# On envoie un mail à disconnect
|
||||||
|
@ -299,7 +298,6 @@ for elupload, eltype, elid in uploadeurs:
|
||||||
mail = connectsmtp()
|
mail = connectsmtp()
|
||||||
|
|
||||||
corps = mail_module.generate('upload_soft', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string()
|
corps = mail_module.generate('upload_soft', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string()
|
||||||
corps = corps.encode('utf-8')
|
|
||||||
mail.sendmail(upload.expediteur, proprio.email(), corps)
|
mail.sendmail(upload.expediteur, proprio.email(), corps)
|
||||||
|
|
||||||
# On envoie un mail à disconnect
|
# On envoie un mail à disconnect
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue