summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-02 19:25:07 +0100
committerAleksander Machniak <alec@alec.pl>2013-01-02 19:25:07 +0100
commit232535f76e50c08e77d8cba599fabe7fe8ca42d4 (patch)
tree447a34364be356fbb3b03cc859ecbef025ef72df /program/lib
parentb903c2145084f2d294a92e98971ab14ba47aa060 (diff)
Add option to use envelope From address for MDN responses (#1488880)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_smtp.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_smtp.php b/program/lib/Roundcube/rcube_smtp.php
index 79ffcfbf8..5c7d2203c 100644
--- a/program/lib/Roundcube/rcube_smtp.php
+++ b/program/lib/Roundcube/rcube_smtp.php
@@ -227,7 +227,8 @@ class rcube_smtp
}
// RFC2298.3: remove envelope sender address
- if (preg_match('/Content-Type: multipart\/report/', $text_headers)
+ if (empty($opts['mdn_use_from'])
+ && preg_match('/Content-Type: multipart\/report/', $text_headers)
&& preg_match('/report-type=disposition-notification/', $text_headers)
) {
$from = '';