diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-07 16:54:07 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-10-07 16:54:07 +0000 |
| commit | 6ebc22a4c0f2df8f3e0c41dba4e375dd232559be (patch) | |
| tree | f9339c0288e2e6e8a288cce9e288a7770df5734a | |
| parent | 4843b2d3f7162b19d7e16117f25dc175bc67dc9e (diff) | |
- Write username instead of id in sendmail log (#1485477)
git-svn-id: https://svn.roundcube.net/trunk@1953 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 6 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index f02340992..a1e9cb1af 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/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) : '')); |