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

Merge pull request #3503 from Icinga/fix/let-redirect-http-use-http-for-redirection

This commit is contained in:
Johannes Meyer 2018-07-04 15:57:39 +02:00 committed by GitHub
parent 10fa64b7e3 1f677e64f6
commit 2a48bd0f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,6 +424,10 @@ class ActionController extends Zend_Controller_Action
protected function redirectHttp($url)
{
if ($this->isXhr()) {
$this->getResponse()->setHeader('X-Icinga-Redirect-Http', 'yes');
}
$this->getResponse()->redirectAndExit($url);
}

6
public/js/icinga/loader.js
View File

@ -343,6 +343,12 @@
}
}
var useHttp = req.getResponseHeader('X-Icinga-Redirect-Http');
if (useHttp === 'yes') {
window.location.replace(redirect);
return true;
}
this.redirectToUrl(
redirect, req.$target, req.url, req.getResponseHeader('X-Icinga-Rerender-Layout'), req.forceFocus,
req.getResponseHeader('X-Icinga-Refresh')