tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActionController: remove redirectToLogin default 

The redirectOnLogin function now doesn't have any predefined default.
This also leads to the behaviour that "Logout" will not redirect you
anywhere on a new login while "forcibly being logged out" (e.g. by
logging out in another browser tab) will bring you back to where you
came from.
This commit is contained in:
Thomas Gelf 2014-08-19 12:28:24 +02:00
parent 7334716d15
commit db3ef8fbd0
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/Web/Controller/ActionController.php
View File

@ -254,8 +254,10 @@ class ActionController extends Zend_Controller_Action
*
* @throws \Exception
*/
protected function redirectToLogin($afterLogin = '/dashboard')
protected function redirectToLogin($afterLogin = null)
{
$redir = null;
if ($afterLogin !== null) {
if (! $afterLogin instanceof Url) {
$afterLogin = Url::fromPath($afterLogin);
}
@ -265,7 +267,10 @@ class ActionController extends Zend_Controller_Action
// TODO: Ignore /?
$redir = $afterLogin->getRelativeUrl();
}
}
$url = Url::fromPath('authentication/login');
if ($redir) {
$url->setParam('redirect', $redir);
}