From 32234d71d3e7817607ba97f76b7d22b1999a0982 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 19 Jan 2011 08:11:47 -0500
Subject: [PATCH] Better fix for login redirect, don't force mail task
---
index.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 244d2f9..3d57571 100644
--- a/index.php
+++ b/index.php
@@ -105,11 +105,16 @@
// restore original request parameters
$query = array();
- if ($url = get_input_value('_url', RCUBE_INPUT_POST))
+ 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']);
+ }
// allow plugins to control the redirect url after login success
- $redir = $RCMAIL->plugins->exec_hook('login_after', array('_task' => 'mail') + $query);
+ $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('_task' => 'mail'));
unset($redir['abort']);
// send redirect
--
Gitblit v1.9.1