From e7cc4e9d0e9a40274c8e337d0330e19dc450d929 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 10 Dec 2019 15:10:31 +0100
Subject: [serversetup-bwlp-ipxe/minilinux] Add comments, fix minor logic bug

Saving a boot entry didn't properly check the validity of a hook's ID,
which was broken anyways, so the invalid check didn't uncover that the
actual cheking code didn't work either.
---
 modules-available/serversetup-bwlp-ipxe/page.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules-available/serversetup-bwlp-ipxe/page.inc.php')

diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index cc5fdbe5..a636665e 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -527,7 +527,7 @@ class Page_ServerSetup extends Page
 						if ($he->moduleId === $row['module']) {
 							$he->setSelected($row['data']);
 							$he->checked = 'checked';
-							if ($he->getBootEntry($row['data']) === null) {
+							if (!$he->isValidId($he->getSelected())) {
 								Message::addError('invalid-custom-entry-id', $row['module'], $row['data']);
 							}
 							break;
@@ -848,8 +848,7 @@ class Page_ServerSetup extends Page
 			/** @var BootEntryHook $module */
 			$module = $hook->run();
 			$id = Request::post('selection-' . $type, false, 'string');
-			$entry = $module->isValidId($id);
-			if ($entry === null) {
+			if (!$module->isValidId($id)) {
 				Message::addError('invalid-custom-entry-id', $type, $id);
 				return;
 			}
-- 
cgit v1.2.3-55-g7522