From a22cb65adbde7e7b101d2c950b617eaec6f5c790 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 07 Oct 2008 12:54:07 -0400
Subject: [PATCH] - Write username instead of id in sendmail log (#1485477)
---
CHANGELOG | 6 ++++++
program/steps/mail/func.inc | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f023409..a1e9cb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/10/07 (alec)
+----------
+- Write username instead of id in sendmail log (#1485477)
+- Fix htmlspecialchars() use for PHP version < 5.2.3 (#1485475)
+- Fix js keywords escaping in json_serialize() for IE/Opera (#1485472)
+
2008/10/03 (alec)
----------
- Add support for SJIS, GB2312, BIG5 in rc_detect_encoding()
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 43e21ee..21014fd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1154,7 +1154,7 @@
*/
function rcmail_deliver_message(&$message, $from, $mailto)
{
- global $CONFIG;
+ global $CONFIG, $RCMAIL;
$msg_body = $message->get();
$headers = $message->headers();
@@ -1210,9 +1210,9 @@
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) : ''));
--
Gitblit v1.9.1