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 #4655 from Icinga/fix/duplicate-ids-in-html-3762 

Fix duplicate ids in html
This commit is contained in:
Johannes Meyer 2022-02-04 17:26:48 +01:00 committed by GitHub
parent 974bff9227 fe6be6a107
commit 49ced694e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Form.php
View File

@ -1085,7 +1085,7 @@ class Form extends Zend_Form
return $this; return $this;
} }
if ($this->getElement($this->tokenElementName) === null) { if ($this->getElement($this->tokenElementName) === null) {
$this->addElement(new CsrfCounterMeasure($this->tokenElementName)); $this->addElement('CsrfCounterMeasure', $this->tokenElementName);
} }
} }
return $this; return $this;

2
library/Icinga/Web/Form/Element/CsrfCounterMeasure.php
View File

@ -40,7 +40,7 @@ class CsrfCounterMeasure extends FormElement
*/ */
public function init() public function init()
{ {
$this->addDecorator('ViewHelper'); $this->setDecorators(['ViewHelper']);
$this->setValue($this->generateCsrfToken()); $this->setValue($this->generateCsrfToken());
} }

2
modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml
View File

@ -4,6 +4,7 @@
<li> <li>
<?php <?php
$removeAckForm = clone $removeAckForm; $removeAckForm = clone $removeAckForm;
$removeAckForm->setName('quickAction_' . $removeAckForm->getName()); // Avoids id duplication
$removeAckForm->setLabelEnabled(true); $removeAckForm->setLabelEnabled(true);
echo $removeAckForm; echo $removeAckForm;
?> ?>
@ -42,6 +43,7 @@
</li> </li>
<?php endif ?> <?php endif ?>
<?php if (isset($checkNowForm)): // Form is unset if the current user lacks the respective permission ?> <?php if (isset($checkNowForm)): // Form is unset if the current user lacks the respective permission ?>
<?php ($checkNowForm = clone $checkNowForm)->setName('quickAction_' . $checkNowForm->getName()); // Avoids id duplication ?>
<li><?= $checkNowForm ?></li> <li><?= $checkNowForm ?></li>
<?php endif ?> <?php endif ?>
<?php if ($this->hasPermission('monitoring/command/comment/add')): ?> <?php if ($this->hasPermission('monitoring/command/comment/add')): ?>

4
public/js/icinga/utils.js
View File

@ -373,8 +373,8 @@
while (true) { while (true) {
var id = element.id; var id = element.id;
// Ignore forms and form controls because id generation is unreliable :( // Only use ids if they're truly unique
if (id && ! element.form && ! (element instanceof HTMLFormElement)) { if (!! id && document.querySelectorAll('* #' + id).length === 1) {
path.push('#' + id); path.push('#' + id);
break; break;
} }