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

ActionController: Let the repsonse itself set its headers 

The only header that is now set by the ActionController is X-Icinga-Title,
all others are delegated to Icinga\Web\Response.
This commit is contained in:
Johannes Meyer 2017-07-13 12:56:03 +02:00
parent 0d52bb421f
commit b93dc06f5b
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ use Icinga\File\Pdf;
use Icinga\Forms\AutoRefreshForm;
use Icinga\Security\SecurityException;
use Icinga\Util\Translator;
use Icinga\Web\Notification;
use Icinga\Web\Session;
use Icinga\Web\Url;
use Icinga\Web\UrlParams;
@ -495,17 +494,8 @@ class ActionController extends Zend_Controller_Action
{
$resp = $this->getResponse();
$notifications = Notification::getInstance();
if ($notifications->hasMessages()) {
$notificationList = array();
foreach ($notifications->popMessages() as $m) {
$notificationList[] = rawurlencode($m->type . ' ' . $m->message);
}
$resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);
}
if ($this->reloadCss) {
$resp->setHeader('X-Icinga-CssReload', 'now', true);
$resp->setReloadCss(true);
}
if ($this->view->title) {
@ -525,7 +515,7 @@ class ActionController extends Zend_Controller_Action
$layout = $this->_helper->layout();
if ($this->rerenderLayout) {
$layout->setLayout($this->innerLayout);
$this->getResponse()->setHeader('X-Icinga-Container', 'layout', true);
$resp->setRerenderLayout(true);
} else {
// The layout may be disabled and there's no indication that the layout is explicitly desired,
// that's why we're passing false as second parameter to setLayout
@ -533,7 +523,7 @@ class ActionController extends Zend_Controller_Action
}
if ($this->autorefreshInterval !== null) {
$resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval, true);
$resp->setAutoRefreshInterval($this->autorefreshInterval);
}
}

9
library/Icinga/Web/Response.php
View File

@ -271,6 +271,15 @@ class Response extends Zend_Controller_Response_Http
if (($autoRefreshInterval = $this->getAutoRefreshInterval()) !== null) {
$this->setHeader('X-Icinga-Refresh', $autoRefreshInterval, true);
}
$notifications = Notification::getInstance();
if ($notifications->hasMessages()) {
$notificationList = array();
foreach ($notifications->popMessages() as $m) {
$notificationList[] = rawurlencode($m->type . ' ' . $m->message);
}
$this->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);
}
} else {
if ($redirectUrl !== null) {
$this->setRedirect($redirectUrl->getAbsoluteUrl());