diff options
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/api.inc.php | 5 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/api.inc.php b/modules-available/serversetup-bwlp-ipxe/api.inc.php index dcfa7774..7575ad55 100644 --- a/modules-available/serversetup-bwlp-ipxe/api.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/api.inc.php @@ -7,7 +7,10 @@ } else { $builder = new ScriptBuilderIpxe(); } - $bootEntryId = Util::cleanUtf8(Request::get('beid', false, 'string')); + $bootEntryId = Request::get('beid', false, 'string'); + if ($bootEntryId !== false) { + $bootEntryId = Util::cleanUtf8($bootEntryId); + } $entryId = Request::get('entryid', false, 'int'); if ($bootEntryId !== false) { $entry = BootEntry::fromDatabaseId($bootEntryId); diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php index a6376b0e..3b2b847f 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php @@ -224,12 +224,12 @@ HERE; */ private function getMenuItemScript($requestedDefaultId, $entry) { - if ($entry->bootEntry === null || (!empty($this->platform) && !$entry->bootEntry->supportsMode($this->platform))) - return ''; $str = 'item '; if ($entry->gap) { $str .= '--gap -- '; } else { + if ($entry->bootEntry === null || (!empty($this->platform) && !$entry->bootEntry->supportsMode($this->platform))) + return ''; if ($entry->hidden && $this->hasExtension) { if ($entry->hotkey === false) return ''; // Hidden entries without hotkey are illegal |