From 81fd8797d8aaedae4cd6842ed737de27beb0e684 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 24 Aug 2011 05:39:30 -0400
Subject: [PATCH] Backport from trunk
---
index.php | 2 +-
program/include/main.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/index.php b/index.php
index c06eca1..7229c90 100644
--- a/index.php
+++ b/index.php
@@ -155,7 +155,7 @@
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
// log session failures
- if ($RCMAIL->task != 'login' && $RCMAIL->task != 'logout' && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
+ if (!in_array(get_input_value('_task', RCUBE_INPUT_GPC), array('login','logout')) && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
$RCMAIL->session->log("Aborted session " . $sess_id . "; no valid session data found");
$session_error = true;
}
diff --git a/program/include/main.inc b/program/include/main.inc
index 82d3eb7..0401fe2 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -2143,8 +2143,8 @@
if (!$RCMAIL->config->get('log_logins') || !$RCMAIL->user)
return;
- write_log('userlogins', sprintf('Successful login for %s (ID: %d) from %s',
- $RCMAIL->user->get_username(), $RCMAIL->user->ID, rcmail_remote_ip()));
+ write_log('userlogins', sprintf('Successful login for %s (ID: %d) from %s in session %s',
+ $RCMAIL->user->get_username(), $RCMAIL->user->ID, rcmail_remote_ip(), session_id()));
}
--
Gitblit v1.9.1