diff options
Diffstat (limited to 'modules-available/serversetup-bwlp-ipxe/page.inc.php')
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/page.inc.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 9bf0afe4..122c3791 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -379,7 +379,8 @@ class Page_ServerSetup extends Page // if = edit, else = add new if ($id !== 0) { $menu = Database::queryFirst("SELECT menuid, timeoutms, title, defaultentryid, isdefault - FROM serversetup_menu WHERE menuid = :id", compact('id')); + FROM serversetup_menu m + WHERE menuid = :id", compact('id')); } else { $menu = []; $menu['menuid'] = 0; @@ -405,8 +406,12 @@ class Page_ServerSetup extends Page $menu['timeout'] = round($menu['timeoutms'] / 1000); $menu['entries'] = []; - $res = Database::simpleQuery("SELECT menuentryid, entryid, refmenuid, hotkey, title, hidden, sortval, plainpass FROM - serversetup_menuentry WHERE menuid = :id ORDER BY sortval ASC", compact('id')); + $res = Database::simpleQuery("SELECT me.menuentryid, me.entryid, me.refmenuid, me.hotkey, me.title, + me.hidden, me.sortval, me.plainpass, be.title AS parenttitle + FROM serversetup_menuentry me + LEFT JOIN serversetup_bootentry be USING (entryid) + 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']; |