summaryrefslogtreecommitdiff
path: root/program/steps
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/steps
parentb903c2145084f2d294a92e98971ab14ba47aa060 (diff)
Add option to use envelope From address for MDN responses (#1488880)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 44a1557c3..f82e60a36 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1687,6 +1687,9 @@ function rcmail_send_mdn($message, &$smtp_error)
if ($agent = $RCMAIL->config->get('useragent'))
$headers['User-Agent'] = $agent;
+ if ($RCMAIL->config->get('mdn_use_from'))
+ $options['mdn_use_from'] = true;
+
$body = rcube_label("yourmessage") . "\r\n\r\n" .
"\t" . rcube_label("to") . ': ' . rcube_mime::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
"\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
@@ -1708,7 +1711,7 @@ function rcmail_send_mdn($message, &$smtp_error)
$compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');
- $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file);
+ $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);
if ($sent)
{