From bd9d8a5fbbf39b135bc9916f94f2ad63602bda6e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 27 Mar 2019 16:26:06 +0100
Subject: [serversetup-bwlp-ipxe] Escape model names for form field names
---
modules-available/serversetup-bwlp-ipxe/page.inc.php | 3 ++-
modules-available/serversetup-bwlp-ipxe/templates/localboot.html | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 3d5e2c15..9366b93f 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -274,6 +274,7 @@ class Page_ServerSetup extends Page
LEFT JOIN serversetup_localboot sl USING (systemmodel)
ORDER BY systemmodel', ['cutoff' => $cutoff]);
while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+ $row['modelesc'] = urlencode($row['systemmodel']);
$row['options'] = $this->makeSelectArray(Localboot::BOOT_METHODS, $row);
$models[] = $row;
}
@@ -908,7 +909,7 @@ class Page_ServerSetup extends Page
foreach ($overrides as $model => $modes) {
if (empty($modes)) // No override
continue;
- $params = ['model' => $model, 'EFI' => null, 'PCBIOS' => null];
+ $params = ['model' => urldecode($model), 'EFI' => null, 'PCBIOS' => null];
foreach (['EFI', 'PCBIOS'] as $m) {
if (empty($modes[$m]))
continue;
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/localboot.html b/modules-available/serversetup-bwlp-ipxe/templates/localboot.html
index 816459e8..0c6f0f03 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/localboot.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/localboot.html
@@ -46,7 +46,7 @@
| {{systemmodel}} |
{{cnt}} |
- |
- |