From e97dcb72cb24f8c54c2b8f84b7e15b734a5a339d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Mar 2019 12:35:59 +0100
Subject: [serversetup-bwlp-ipxe] Redirect to serveraddr page if invalid

---
 modules-available/serversetup-bwlp-ipxe/page.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index bcb241b5..6bf166ea 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -108,12 +108,14 @@ class Page_ServerSetup extends Page
 
 		User::assertPermission('access-page');
 
+		$addr = false;
 		if (User::hasPermission('ipxe.*')) {
 			Dashboard::addSubmenu('?do=serversetup&show=menu', Dictionary::translate('submenu_menu', true));
 			Dashboard::addSubmenu('?do=serversetup&show=bootentry', Dictionary::translate('submenu_bootentry', true));
 		}
 		if (User::hasPermission('edit.address')) {
 			Dashboard::addSubmenu('?do=serversetup&show=address', Dictionary::translate('submenu_address', true));
+			$addr = true;
 		}
 		if (User::hasPermission('download')) {
 			Dashboard::addSubmenu('?do=serversetup&show=download', Dictionary::translate('submenu_download', true));
@@ -128,6 +130,8 @@ class Page_ServerSetup extends Page
 			$subs = Dashboard::getSubmenus();
 			if (empty($subs)) {
 				User::assertPermission('download');
+			} elseif (Property::getServerIp() === 'invalid' && $addr) {
+				Util::redirect('?do=serversetup&show=address');
 			} else {
 				Util::redirect($subs[0]['url']);
 			}
-- 
cgit v1.2.3-55-g7522