diff options
author | thomascube <thomas@roundcube.net> | 2011-01-19 13:11:47 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2011-01-19 13:11:47 +0000 |
commit | 32234d71d3e7817607ba97f76b7d22b1999a0982 (patch) | |
tree | 9ad4d53ba891fbca75d73d1e19257998634d49e9 /index.php | |
parent | 8ec1b91bb931dca361944db021e9b3706ad04c06 (diff) |
Better fix for login redirect, don't force mail task
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -105,11 +105,16 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') { // 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 |