summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-10-07 16:54:07 +0000
committeralecpl <alec@alec.pl>2008-10-07 16:54:07 +0000
commita22cb65adbde7e7b101d2c950b617eaec6f5c790 (patch)
tree16f4bbe251cc77125f73c940fa5568707f5e727b /program/steps/mail
parentda402d66df24e3d0120dc933dcba5a6aa16454ed (diff)
- Write username instead of id in sendmail log (#1485477)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 43e21eea2..21014fdb1 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1154,7 +1154,7 @@ function rcmail_compose_cleanup()
*/
function rcmail_deliver_message(&$message, $from, $mailto)
{
- global $CONFIG;
+ global $CONFIG, $RCMAIL;
$msg_body = $message->get();
$headers = $message->headers();
@@ -1210,9 +1210,9 @@ function rcmail_deliver_message(&$message, $from, $mailto)
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",
+ write_log('sendmail', sprintf("[%s] User: %s on %s; Message for %s; %s",
date("d-M-Y H:i:s O", mktime()),
- $_SESSION['user_id'],
+ $RCMAIL->user->get_username(),
$_SERVER['REMOTE_ADDR'],
$mailto,
!empty($smtp_response) ? join('; ', $smtp_response) : ''));