From 5e6cabf99eb63666dd2f2a52ae865510e8453181 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 5 Jul 2016 13:30:35 +0200
Subject: [serversetup] Show warning on main page if ip address is not set

---
 modules-available/serversetup-bwlp/hooks/main-warning.inc.php | 6 ++++++
 modules-available/serversetup-bwlp/lang/de/messages.json      | 3 ++-
 modules-available/serversetup-bwlp/lang/en/messages.json      | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 modules-available/serversetup-bwlp/hooks/main-warning.inc.php

diff --git a/modules-available/serversetup-bwlp/hooks/main-warning.inc.php b/modules-available/serversetup-bwlp/hooks/main-warning.inc.php
new file mode 100644
index 00000000..a2eba6ff
--- /dev/null
+++ b/modules-available/serversetup-bwlp/hooks/main-warning.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', Property::getServerIp())) {
+	Message::addError('serversetup.no-ip-addr-set', true);
+	$needSetup = true;
+}
diff --git a/modules-available/serversetup-bwlp/lang/de/messages.json b/modules-available/serversetup-bwlp/lang/de/messages.json
index c39958f6..3e2cc834 100644
--- a/modules-available/serversetup-bwlp/lang/de/messages.json
+++ b/modules-available/serversetup-bwlp/lang/de/messages.json
@@ -1,4 +1,5 @@
 {
     "image-not-found": "USB-Image nicht gefunden. Generieren Sie das Bootmen\u00fc neu.",
-    "invalid-ip": "Kein Interface ist auf die Adresse {{0}} konfiguriert"
+    "invalid-ip": "Kein Interface ist auf die Adresse {{0}} konfiguriert",
+    "no-ip-addr-set": "Bitte w\u00e4hlen Sie die prim\u00e4re IP-Adresse des Servers"
 }
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/lang/en/messages.json b/modules-available/serversetup-bwlp/lang/en/messages.json
index 1e9fe612..d4ba6905 100644
--- a/modules-available/serversetup-bwlp/lang/en/messages.json
+++ b/modules-available/serversetup-bwlp/lang/en/messages.json
@@ -1,4 +1,5 @@
 {
     "image-not-found": "USB image not found. Try regenerating the boot menu first.",
-    "invalid-ip": "No interface is configured with the address {{0}}"
+    "invalid-ip": "No interface is configured with the address {{0}}",
+    "no-ip-addr-set": "Please set the server's primary IP address"
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522