From 5228a5558f0ee9af785f1b4cdcef4d97b17b33f6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Mar 2011 03:55:20 -0500
Subject: [PATCH] - Applied fixes from trunk
---
index.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/index.php b/index.php
index f4e2a55..cf33693 100644
--- a/index.php
+++ b/index.php
@@ -95,10 +95,12 @@
}
else if ($auth['valid'] && !$auth['abort'] &&
!empty($auth['host']) && !empty($auth['user']) &&
- $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
- // create new session ID
+ $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])
+ ) {
+ // create new session ID, don't destroy the current session
+ // it was destroyed already by $RCMAIL->kill_session() above
$RCMAIL->session->remove('temp');
- $RCMAIL->session->regenerate_id();
+ $RCMAIL->session->regenerate_id(false);
// send auth cookie if necessary
$RCMAIL->authenticate_session();
@@ -110,7 +112,7 @@
$query = array();
if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
parse_str($url, $query);
-
+
// prevent endless looping on login page
if ($query['_task'] == 'login')
unset($query['_task']);
--
Gitblit v1.9.1