diff options
| author | alecpl <alec@alec.pl> | 2010-07-29 08:12:44 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-07-29 08:12:44 +0000 |
| commit | db1f1e31ca60658d605b7a60c7d43a3e37aa8923 (patch) | |
| tree | 676867c9883f4cfed39b261c93bf4c7014b0b738 | |
| parent | 8fc8101c917d6857ccc5524923740f0afc990b0c (diff) | |
- Include all recipients in sendmail log
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 8 |
2 files changed, 9 insertions, 0 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Include all recipients in sendmail log - Support HTTP_X_FORWARDED_PROTO header for HTTPS detecting (#1486866) - Fix default IMAP port configuration (#1486864) - Create Sent folder when starting to compose a new message (#1486802) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 9d6d96dfb..a1cc68d16 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1444,6 +1444,14 @@ function rcmail_deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_ // remove MDN headers after sending unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']); + // get all recipients + if ($headers['Cc']) + $mailto .= $headers['Cc']; + if ($headers['Bcc']) + $mailto .= $headers['Bcc']; + if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m)) + $mailto = implode(', ', array_unique($m[1])); + if ($CONFIG['smtp_log']) { write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s", $RCMAIL->user->get_username(), |