summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-02-20 22:47:06 +0000
committerthomascube <thomas@roundcube.net>2008-02-20 22:47:06 +0000
commitae8f192c90dfab0bfa052d7cb247e03e80a7a249 (patch)
treeef7ba9f63928eed06969dae7ca47c2d1c19d1b25
parentf8895e8768ac4df72d6377ddf95cabfc092d0e1f (diff)
Remove MDN headers before saving in sent folder + fix wrong variale name
-rw-r--r--program/include/main.inc2
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 06cf706ea..0843f43ce 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -381,7 +381,7 @@ function get_sequence_name($sequence)
if (strlen($CONFIG[$config_key]))
return $CONFIG[$config_key];
- return $table;
+ return $sequence;
}
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index f14c532b4..b1ce4bd4e 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1435,6 +1435,8 @@ function rcmail_deliver_message(&$message, $from, $mailto)
$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
}
+ if ($sent) // remove MDN headers after sending
+ unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
$message->_headers = array();
$message->headers($headers);