diff options
Diffstat (limited to 'modules-available/serversetup-bwlp/inc')
-rw-r--r-- | modules-available/serversetup-bwlp/inc/ipxemenu.inc.php | 6 | ||||
-rw-r--r-- | modules-available/serversetup-bwlp/inc/menuentry.inc.php | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php index 56041c20..6429a2a7 100644 --- a/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php +++ b/modules-available/serversetup-bwlp/inc/ipxemenu.inc.php @@ -36,11 +36,11 @@ class IPxeMenu } } - public function getMenuDefinition($targetVar, $mode) + public function getMenuDefinition($targetVar, $mode, $slxExtensions) { - $str = "menu {$this->title}\n"; + $str = "menu -- {$this->title}\n"; foreach ($this->items as $item) { - $str .= $item->getMenuItemScript("m_{$this->menuid}", $this->defaultEntryId, $mode); + $str .= $item->getMenuItemScript("m_{$this->menuid}", $this->defaultEntryId, $mode, $slxExtensions); } if ($this->defaultEntryId === null) { $defaultLabel = "mx_{$this->menuid}_poweroff"; diff --git a/modules-available/serversetup-bwlp/inc/menuentry.inc.php b/modules-available/serversetup-bwlp/inc/menuentry.inc.php index 03b860e8..d243fd23 100644 --- a/modules-available/serversetup-bwlp/inc/menuentry.inc.php +++ b/modules-available/serversetup-bwlp/inc/menuentry.inc.php @@ -58,7 +58,7 @@ class MenuEntry settype($this->menuentryid, 'int'); } - public function getMenuItemScript($lblPrefix, $requestedDefaultId, $mode) + public function getMenuItemScript($lblPrefix, $requestedDefaultId, $mode, $slxExtensions) { if ($this->bootEntry !== null && !$this->bootEntry->supportsMode($mode)) return ''; @@ -66,7 +66,7 @@ class MenuEntry if ($this->gap) { $str .= '--gap '; } else { - if ($this->hidden) { + if ($this->hidden && $slxExtensions) { if ($this->hotkey === false) return ''; // Hidden entries without hotkey are illegal $str .= '--hidden '; @@ -79,7 +79,11 @@ class MenuEntry } $str .= "{$lblPrefix}_{$this->menuentryid} "; } - $str .= $this->title; + if (empty($this->title)) { + $str .= '${}'; + } else { + $str .= $this->title; + } return $str . " || prompt Could not create menu item for {$lblPrefix}_{$this->menuentryid}\n"; } |