summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-07-05 13:30:35 +0200
committerSimon Rettberg2016-07-05 13:30:35 +0200
commit5e6cabf99eb63666dd2f2a52ae865510e8453181 (patch)
tree03fe835d0ee97ade5c3eb6bb2d029630331102d9
parentfixed bug. (diff)
downloadslx-admin-5e6cabf99eb63666dd2f2a52ae865510e8453181.tar.gz
slx-admin-5e6cabf99eb63666dd2f2a52ae865510e8453181.tar.xz
slx-admin-5e6cabf99eb63666dd2f2a52ae865510e8453181.zip
[serversetup] Show warning on main page if ip address is not set
-rw-r--r--modules-available/serversetup-bwlp/hooks/main-warning.inc.php6
-rw-r--r--modules-available/serversetup-bwlp/lang/de/messages.json3
-rw-r--r--modules-available/serversetup-bwlp/lang/en/messages.json3
3 files changed, 10 insertions, 2 deletions
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