From 79aeb308cb195dcc48004851795e811cee6f8ca1 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Aug 2008 03:40:35 -0400
Subject: [PATCH] - Write to log also sent MDN confirmation messages
---
CHANGELOG | 1 +
program/steps/mail/func.inc | 15 +++++++++++++--
program/steps/mail/sendmail.inc | 11 -----------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0b1c4ba..5367fab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
----------
- Added options to use syslog instead of log file (#1484850)
- Added Logging & Debugging section in Installer
+- Write to smtp log also sent MDN confirmations
2008/08/26 (alec)
----------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index f578090..b1f359f 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1076,7 +1076,7 @@
$msg_body = $message->get();
$headers = $message->headers();
-
+
// send thru SMTP server using custom SMTP library
if ($CONFIG['smtp_server'])
{
@@ -1122,8 +1122,19 @@
$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
}
- if ($sent) // remove MDN headers after sending
+ if ($sent)
+ {
+ // remove MDN headers after sending
unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
+
+ if ($CONFIG['smtp_log'])
+ write_log('sendmail', sprintf("[%s] User: %d on %s; Message for %s; %s",
+ date("d-M-Y H:i:s O", mktime()),
+ $_SESSION['user_id'],
+ $_SERVER['REMOTE_ADDR'],
+ $mailto,
+ !empty($smtp_response) ? join('; ', $smtp_response) : ''));
+ }
$message->_headers = array();
$message->headers($headers);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 25d95f9..301df52 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -418,17 +418,6 @@
}
else
{
- if ($CONFIG['smtp_log'])
- {
- write_log('sendmail', sprintf(
- "[%s] User: %d on %s; Message for %s; %s\n",
- date("d-M-Y H:i:s O", mktime()),
- $_SESSION['user_id'],
- $_SERVER['REMOTE_ADDR'],
- $mailto,
- !empty($smtp_response) ? join('; ', $smtp_response) : ''));
- }
-
rcmail_compose_cleanup();
if ($store_folder && !$saved)
--
Gitblit v1.9.1