es werden nun zwei separate Mails verschickt: from->to und admin->from (neu)

This commit is contained in:
lars 2012-08-16 20:54:34 +00:00
parent b5981dfc91
commit e6496665c6
4 changed files with 13 additions and 4 deletions

View file

@ -163,7 +163,7 @@ def send_mail(to_address, from_address, subject, text):
s = smtplib.SMTP_SSL(host)
else:
s = smtplib.SMTP(host)
s.sendmail(from_address, [to_address, from_address], msg.as_string())
s.sendmail(from_address, [to_address], msg.as_string())
s.quit()
@bobo.query('/submit')
@ -214,6 +214,12 @@ def do_submit(session_id=None, subject=None, from_address=None,
except smtplib.SMTPException, err_msg:
params["errors"] = "Der Versand der Mail schlug fehl: %s" % err_msg
return render("summary.html", input_data=input_data, **params)
admin_address = config.get("mail", "admin_address", "")
try:
if admin_address:
send_mail(from_address, admin_address, subject, summary_text)
except smtplib.SMTPException, err_msg:
pass
submission = Submission(session=session,
to_default_destination=(to_address == params["to_address"]),
title=subject, text=summary_text)