From 53e7f1beefeeaa44ec963dcf854f2f5acbd04681 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 25 Aug 2011 11:34:33 +0200 Subject: [PATCH] Auto-reply extension was a little bit broken :p fixed #157 & #158 --- extensions/postfix_autoreply/scripts/autoreply.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/postfix_autoreply/scripts/autoreply.py b/extensions/postfix_autoreply/scripts/autoreply.py index 3d90adbbf..01f771500 100755 --- a/extensions/postfix_autoreply/scripts/autoreply.py +++ b/extensions/postfix_autoreply/scripts/autoreply.py @@ -12,7 +12,8 @@ from modoboa.extensions.postfix_autoreply import main from modoboa.extensions.postfix_autoreply.models import ARmessage, ARhistoric def send_autoreply(sender, mailbox, armessage): - if armessage.untildate < datetime.datetime.now(): + if armessage.untildate is not None \ + and armessage.untildate < datetime.datetime.now(): armessage.enabled = False armessage.save() return @@ -32,12 +33,12 @@ def send_autoreply(sender, mailbox, armessage): msg = MIMEText(armessage.content.encode('utf-8'), _charset='utf-8') msg['Subject'] = armessage.subject - msg['From'] = mailbox + msg['From'] = mailbox.full_address msg['To'] = sender s = smtplib.SMTP() s.connect() - s.sendmail(mailbox, sender, msg.as_string()) + s.sendmail(mailbox.full_address, sender, msg.as_string()) s.quit() lastar.last_sent = datetime.datetime.now()