From 4d773b27e9c5cc854c4525a2000f47eccc4f15fd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Mar 2019 10:36:08 +0100
Subject: [serversetup-bwlp-ipxe] Fix editing menuchain entries, tweak script

---
 modules-available/serversetup-bwlp-ipxe/page.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 8ea782b3..9b97ff01 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -390,6 +390,9 @@ class Page_ServerSetup extends Page
 		$res = Database::simpleQuery("SELECT menuentryid, entryid, refmenuid, hotkey, title, hidden, sortval, plainpass FROM
 			serversetup_menuentry WHERE menuid = :id ORDER BY sortval ASC", compact('id'));
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			if ($row['entryid'] === null && $row['refmenuid'] !== null) {
+				$row['entryid'] = 'menu:' . $row['refmenuid'];
+			}
 			if ($row['entryid'] == $highlight) {
 				$row['highlight'] = 'active';
 			}
@@ -399,7 +402,7 @@ class Page_ServerSetup extends Page
 		$menu['entrylist'] = array_merge(
 			Database::queryAll("SELECT entryid, title, hotkey, data FROM serversetup_bootentry ORDER BY title ASC"),
 			// Add all menus, so we can link
-			Database::queryAll("SELECT Concat('menu=', menuid) AS entryid, title FROM serversetup_menu ORDER BY title ASC")
+			Database::queryAll("SELECT Concat('menu:', menuid) AS entryid, title FROM serversetup_menu ORDER BY title ASC")
 		);
 		class_exists('BootEntry'); // Leave this here for StandardBootEntry
 		foreach ($menu['entrylist'] as &$bootentry) {
@@ -649,7 +652,7 @@ class Page_ServerSetup extends Page
 						'hidden' => (int)$entry['hidden'], // TODO (needs hotkey to make sense)
 						'plainpass' => $entry['plainpass'],
 					];
-					if (preg_match('/^menu=(\d+)$/', $entry['entryid'], $out)) {
+					if (preg_match('/^menu:(\d+)$/', $entry['entryid'], $out)) {
 						$params['refmenuid'] = $out[1];
 					} else {
 						$params['entryid'] = $entry['entryid'];
-- 
cgit v1.2.3-55-g7522