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

Revert "Fix some XSS vulnerabilities" 

Accidentally pushed. Should re-enter with #3521.
This commit is contained in:
Johannes Meyer 2018-07-11 16:37:39 +02:00
parent 815a050ff8
commit bf5c6a56b3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/body.phtml
View File

@ -46,7 +46,7 @@ if ($this->layout()->inlineLayout) {
</div> </div>
<?php endif ?> <?php endif ?>
<div id="main" role="main"> <div id="main" role="main">
<div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= $this->escape(Url::fromRequest()->without('renderLayout')); ?>"<?= $refresh; ?> style="display: block"> <div id="col1" class="container<?= $moduleClass ?>"<?php if ($moduleName): ?> data-icinga-module="<?= $moduleName ?>" <?php endif ?> data-icinga-url="<?= Url::fromRequest()->without('renderLayout'); ?>"<?= $refresh; ?> style="display: block">
<?= $this->render($inlineLayoutScript) ?> <?= $this->render($inlineLayoutScript) ?>
</div> </div>
<div id="col2" class="container"> <div id="col2" class="container">

6
application/views/scripts/mixedPagination.phtml
View File

@ -10,7 +10,7 @@
$this->totalItemCount $this->totalItemCount
) ?> ) ?>
<li class="nav-item"> <li class="nav-item">
<a href="<?= $this->escape($this->url()->overwriteParams(array('page' => $this->previous))) ?>" <a href="<?= $this->url()->overwriteParams(array('page' => $this->previous)) ?>"
title="<?= $label ?>" title="<?= $label ?>"
aria-label="<?= $label ?>" aria-label="<?= $label ?>"
class="previous-page"> class="previous-page">
@ -44,7 +44,7 @@
); );
?> ?>
<li<?= $page === $this->current ? ' class="active nav-item"' : ' class="nav-item"' ?>> <li<?= $page === $this->current ? ' class="active nav-item"' : ' class="nav-item"' ?>>
<a href="<?= $this->escape($this->url()->overwriteParams(array('page' => $page))) ?>" <a href="<?= $this->url()->overwriteParams(array('page' => $page)) ?>"
title="<?= $label ?>" title="<?= $label ?>"
aria-label="<?= $label ?>"> aria-label="<?= $label ?>">
<?= $page ?> <?= $page ?>
@ -60,7 +60,7 @@
$this->totalItemCount $this->totalItemCount
) ?> ) ?>
<li class="nav-item"> <li class="nav-item">
<a href="<?= $this->escape($this->url()->overwriteParams(array('page' => $this->next))) ?>" <a href="<?= $this->url()->overwriteParams(array('page' => $this->next)) ?>"
title="<?= $label ?>" title="<?= $label ?>"
aria-label="<?= $label ?>" aria-label="<?= $label ?>"
class="next-page"> class="next-page">

2
library/Icinga/Web/Widget/Tab.php
View File

@ -309,7 +309,7 @@ class Tab extends AbstractWidget
$tab = sprintf( $tab = sprintf(
'<a href="%s"%s>%s</a>', '<a href="%s"%s>%s</a>',
htmlspecialchars($this->url), $this->url,
$params, $params,
$caption $caption
); );

2
library/Icinga/Web/Widget/Tabs.php
View File

@ -342,7 +342,7 @@ EOT;
'{LABEL}' '{LABEL}'
), ),
array( array(
htmlspecialchars($url), $url,
$title, $title,
$label $label
), ),