Changeset 7f89041 in github

Timestamp:

Oct 6, 2010 2:19:04 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1b91421

Parents:

868deb5

Message:

• Use empty envelope sender address for message disposition notifications (RFC2298.3)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_smtp.php (modified) (1 diff)

CHANGELOG

@@ -21 +21 @@
 - Add unique index on users.username+users.mail_host
 - Make htmleditor option more consistent and add option to use HTML on reply to HTML message (#1485840)
+- Use empty envelope sender address for message disposition notifications (RFC2298.3)
 
 RELEASE 0.4.2

program/include/rcube_smtp.php

@@ -196 +196 @@
     }
 
+    // RFC2298.3: remove envelope sender address
+    if (preg_match('/Content-Type: multipart\/report/', $text_headers)
+      && preg_match('/report-type=disposition-notification/', $text_headers)
+    ) {
+      $from = '';
+    }
+
     // set From: address
     if (PEAR::isError($this->conn->mailFrom($from)))