diff options
| author | Simon Rettberg | 2020-09-22 15:03:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-09-22 15:03:21 +0200 |
| commit | 147e11fdfeae4ef9817f09ae370239b741896ff5 (patch) | |
| tree | 9b714f0d06dbae7c4ea6cb71be72b8443523c4e8 /modules-available | |
| parent | [statistics] Show if current runmode is different from configured one (diff) | |
| download | slx-admin-147e11fdfeae4ef9817f09ae370239b741896ff5.tar.gz slx-admin-147e11fdfeae4ef9817f09ae370239b741896ff5.tar.xz slx-admin-147e11fdfeae4ef9817f09ae370239b741896ff5.zip | |
[serversetup-bwlp-ipxe] Re-introduce support for menuid param
Diffstat (limited to 'modules-available')
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/api.inc.php | 9 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/api.inc.php b/modules-available/serversetup-bwlp-ipxe/api.inc.php index 7575ad55..1ac885df 100644 --- a/modules-available/serversetup-bwlp-ipxe/api.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/api.inc.php @@ -19,9 +19,16 @@ $entry = MenuEntry::get($entryId); $data = $builder->getMenuEntry($entry); } else { + // Get bootstrap code if required... $data = $builder->bootstrapLive(); if ($data === false) { - $menu = IPxeMenu::forClient($builder->clientIp(), $builder->uuid()); + // ...otherwise, generate normal code + $menuId = Request::get('menuid', false, 'int'); + if ($menuId !== false) { + $menu = IPxeMenu::get($menuId, true); + } else { + $menu = IPxeMenu::forClient($builder->clientIp(), $builder->uuid()); + } $data = $builder->getMenu($menu, true); } } diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php index 3b2b847f..c8f644ab 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php @@ -36,7 +36,7 @@ class ScriptBuilderIpxe extends ScriptBuilderBase } unset($v); } - unset($fromQuery['menuid'], $fromQuery['entryid'], $fromQuery['special']); + unset($fromQuery['entryid'], $fromQuery['special']); if ($key !== null) { $fromQuery[$key] = $value; } |