From 6ebc22a4c0f2df8f3e0c41dba4e375dd232559be Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 7 Oct 2008 16:54:07 +0000 Subject: - Write username instead of id in sendmail log (#1485477) git-svn-id: https://svn.roundcube.net/trunk@1953 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/func.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program') diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 43e21eea2..21014fdb1 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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) : '')); -- cgit v1.2.3