Changeset 11585 for main/waeup.kofa/trunk/src/waeup/kofa/smtp.py

Timestamp:

10 Apr 2014, 12:57:45 (10 years ago)

Author:

uli

Message:

When sending mail, use waeup.org address for from-field.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/smtp.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/smtp.py

@@ -52 +52 @@
 from zope.sendmail.interfaces import IMailDelivery
 from waeup.kofa.interfaces import IMailService
+
+
+#: The hardcoded from address. Must not by yahoo.com.
+FROM_ADDRESS = 'no-reply@waeup.org'
 
 
@@ -158 +162 @@
               subject, body, config=None):
     """Send mail.
+
+    Use `IMailService` to send a mail with the parameters
+    delivered.
+
+    Please note: the `from_addr` given will be used for the reply-to
+    and cc field only. It will _not_ be used for the `from` field, as
+    yahoo does not allow non-yahoo servers to deliver mail with
+    ``@yahoo.com`` in the from-field.
+
+    The from-address set here will be: `FROM_ADDRESS` as set above.
+
+    XXX: The hard-coded from-address should be changable or be
+         determined smarter by looking up a FQDN or similar.
+
     """
     # format message
@@ -165 +183 @@
         body_to += '%s, ' % encode_address(email, rcpt_name)
     body = encode_body(body)
-    body["From"] = body["Cc"] = encode_address(from_addr, from_name)
+    sender_addr = encode_address(FROM_ADDRESS, from_name)
+    reply_addr = encode_address(from_addr, from_name)
+    body["From"] = sender_addr
     body["To"] = body_to.strip(', ')
+    body["Cc"] = body["Reply-To"] = reply_addr
     body["Subject"] = encode_header_item(subject)