From 7f89041e9ae0c6b59b6f2a3d77789764b0421b93 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 06 Oct 2010 14:19:04 -0400
Subject: [PATCH] - Use empty envelope sender address for message disposition notifications (RFC2298.3)
---
program/include/rcube_smtp.php | 7 +++++++
CHANGELOG | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 650b4ba..e408d48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
- Improve tabs to fixed width and add tabs in identities info (#1486974)
- 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
-------------
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index b457476..61eebf3 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -195,6 +195,13 @@
return false;
}
+ // 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)))
{
--
Gitblit v1.9.1