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

Revert "ActionController: Don't override `X-Icinga-Title` when it's already set" 

This reverts commit 4cff1feb8f.

It's broken and obsolete since https://github.com/Icinga/ipl-web/pull/72.
This commit is contained in:
Johannes Meyer 2022-04-12 14:55:59 +02:00
parent e6eb1540c0
commit bc6b17b850
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,20 +496,18 @@ class ActionController extends Zend_Controller_Action
$resp->setReloadCss(true);
}
if ($resp->getHeader('X-Icinga-Title') === null) {
if ($this->view->title) {
if (preg_match('~[\r\n]~', $this->view->title)) {
// TODO: Innocent exception and error log for hack attempts
throw new IcingaException('No way, guy');
}
$resp->setHeader(
'X-Icinga-Title',
rawurlencode($this->view->title . ' :: ' . $this->view->defaultTitle),
true
);
} else {
$resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true);
if ($this->view->title) {
if (preg_match('~[\r\n]~', $this->view->title)) {
// TODO: Innocent exception and error log for hack attempts
throw new IcingaException('No way, guy');
}
$resp->setHeader(
'X-Icinga-Title',
rawurlencode($this->view->title . ' :: ' . $this->view->defaultTitle),
true
);
} else {
$resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true);
}
$layout = $this->_helper->layout();