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)

---
 index.php |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/index.php b/index.php
index 46c4229..adab411 100644
--- a/index.php
+++ b/index.php
@@ -30,9 +30,6 @@
 // include environment
 require_once 'program/include/iniset.php';
 
-// define global vars
-$OUTPUT_TYPE = 'html';
-
 // init application and start session with requested task
 $RCMAIL = rcmail::get_instance();
 
@@ -94,11 +91,12 @@
     $RCMAIL->authenticate_session();
 
     // log successful login
-    if ($RCMAIL->config->get('log_logins') && $RCMAIL->config->get('debug_level') & 1)
-      console(sprintf('Successful login for %s (id %d) from %s',
-                      trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
-                      $_SESSION['user_id'],
-                      $_SERVER['REMOTE_ADDR']));
+    if ($RCMAIL->config->get('log_logins')) {
+      write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
+        $RCMAIL->user->get_username(),
+        $RCMAIL->user->ID,
+        $_SERVER['REMOTE_ADDR']));
+    }
 
     // send redirect
     $OUTPUT->redirect();
@@ -135,7 +133,7 @@
 
 // check client X-header to verify request origin
 if ($OUTPUT->ajax_call) {
-  if ($RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
+  if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
     header('HTTP/1.1 404 Not Found');
     die("Invalid Request");
   }

--
Gitblit v1.9.1