From 89451f30864c01ceedb2fae97355a4835486b4db Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 25 Feb 2015 18:00:28 +0100 Subject: [PATCH] Ensure that form ids are unique Add an unique prefix to each Form- or FormElement id, unless id protection is disabled explicitly, to prevent id collisions between different containers. fixes #8460 --- application/views/helpers/ProtectId.php | 12 +++++ .../config/authentication/reorder.phtml | 2 +- .../views/scripts/mixedPagination.phtml | 4 +- library/Icinga/Web/Form.php | 54 +++++++++++++++++++ library/Icinga/Web/Request.php | 20 +++++++ .../controllers/ListController.php | 2 +- 6 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 application/views/helpers/ProtectId.php diff --git a/application/views/helpers/ProtectId.php b/application/views/helpers/ProtectId.php new file mode 100644 index 000000000..8795a3933 --- /dev/null +++ b/application/views/helpers/ProtectId.php @@ -0,0 +1,12 @@ +getRequest()->protectId($id); + } +} diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml index 4583a23b3..0386cdd5e 100644 --- a/application/views/scripts/config/authentication/reorder.phtml +++ b/application/views/scripts/config/authentication/reorder.phtml @@ -2,7 +2,7 @@
-

+

translate('Authentication Configuration'); ?>

diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml index 4704d8f51..160657b12 100644 --- a/application/views/scripts/mixedPagination.phtml +++ b/application/views/scripts/mixedPagination.phtml @@ -9,8 +9,8 @@ use Icinga\Web\Url; if ($this->pageCount <= 1) return; -?>

-