tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

ActionController: refine url handling on redirect

Browse Source
This commit is contained in:
Thomas Gelf 2014-06-20 13:18:03 +02:00
parent 7cad4de3be
commit dbf03ee647
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,14 +387,14 @@ class ActionController extends Zend_Controller_Action
**/ **/
public function redirectNow($url) public function redirectNow($url)
{ {
$url = Url::fromPath(preg_replace('~&~', '&', $url)); $url = preg_replace('~&~', '&', $url);
if ($this->_request->isXmlHttpRequest()) { if ($this->_request->isXmlHttpRequest()) {
header('X-Icinga-Redirect: ' . rawurlencode($url)); header('X-Icinga-Redirect: ' . rawurlencode($url));
// $this->getResponse()->sendHeaders() ?? // $this->getResponse()->sendHeaders() ??
// Session shutdown // Session shutdown
exit; // Really? exit; // Really?
} else { } else {
$this->_helper->Redirector->gotoUrlAndExit($url->getRelativeUrl()); $this->_helper->Redirector->gotoUrlAndExit(Url::fromPath($url)->getRelativeUrl());
} }
$this->isRedirect = true; // pretty useless right now $this->isRedirect = true; // pretty useless right now
} }