summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-06 18:19:04 +0000
committeralecpl <alec@alec.pl>2010-10-06 18:19:04 +0000
commit7f89041e9ae0c6b59b6f2a3d77789764b0421b93 (patch)
treed079470dae5b265980e7c19bfa5e1d8e363da49c /program/include
parent868deb5dabdc4d63210e4f53a2a80a904247af6a (diff)
- Use empty envelope sender address for message disposition notifications (RFC2298.3)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_smtp.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index b45747661..61eebf3fa 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -195,6 +195,13 @@ class rcube_smtp
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)))
{