Changeset 5119 in subversion

Timestamp:

Aug 24, 2011 5:39:30 AM (21 months ago)

Author:

thomasb

Message:

Backport from trunk

Location:

branches/release-0.6

Files:

• index.php (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)

branches/release-0.6/index.php

@@ -156 +156 @@
 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;

branches/release-0.6/program/include/main.inc

@@ -2144 +2144 @@
     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()));
 }