Installation: SERVER_ADDR verwenden statt REMOTE_ADDR

Und Ausgabe beider IP-Adressen
FriendsOfREDAXO · Aug 20, 2024 · bbb167a · bbb167a
1 parent 487b68a
commit bbb167a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/install.php b/install.php
@@ -24,7 +24,7 @@
 /* Eigene IP-Adresse in die erlaubten IP-Adressen hinzufügen, sofern nicht bereits vorhanden */
 $allowed_ips = strval($addon->getConfig('allowed_ips')); // @phpstan-ignore-line
 $allowed_ips = array_filter(explode(',', $allowed_ips)); // Leere Elemente entfernen
-$ip = rex_server('REMOTE_ADDR', 'string', '');
+$ip = rex_server('SERVER_ADDR', 'string', '');
 
 if (!in_array($ip, $allowed_ips, true)) {
     $allowed_ips[] = $ip;

diff --git a/lang/de_de.lang b/lang/de_de.lang
@@ -77,7 +77,7 @@ maintenance_announcement_end_date_notice = Datum, bis wann die Ankündigung geze
 maintenance_allowed_access_title = Ausnahmen
 
 maintenance_allowed_ips_label = Liste erlaubter IP-Adressen
-maintenance_allowed_ips_notice = IP-Adresse(n) ein, die weiterhin Zugriff auf das Frontend haben soll(en). Die aktuelle IP-Adresse lautet <code>{0}</code>.
+maintenance_allowed_ips_notice = IP-Adresse(n) ein, die weiterhin Zugriff auf das Frontend haben soll(en). Deine aktuelle IP-Adresse lautet <code>{0}</code>, die des Servers lautet <code>{1}</code>.
 
 maintenance_allowed_domains_label = Liste erlaubter Domains
 maintenance_allowed_domains_notice = Domains eintragen, die nicht gesperrt werden sollen.

diff --git a/lang/el_gr.lang b/lang/el_gr.lang
@@ -74,7 +74,7 @@ maintenance_announcement_end_date_notice = Η ημερομηνία που η α
 maintenance_allowed_access_title = Εξαιρέσεις
 
 maintenance_allowed_ips_label = Λίστα επιτρεπόμενων διευθύνσεων IP
-maintenance_allowed_ips_notice = Εισάγετε την(τις) διεύθυνση(εις) IP που θα συνεχίσουν να έχουν πρόσβαση στο frontend. Η τρέχουσα διεύθυνση IP σας: <code>{0}</code>.
+maintenance_allowed_ips_notice = Εισάγετε την(τις) διεύθυνση(εις) IP που θα συνεχίσουν να έχουν πρόσβαση στο frontend. Η τρέχουσα διεύθυνση IP σας: <code>{0}</code>
 
 maintenance_allowed_domains_label = Λίστα επιτρεπόμενων τομέων
 maintenance_allowed_domains_notice = Εισάγετε τους τομείς που δεν θα αποκλειστούν.

diff --git a/lang/en_gb.lang b/lang/en_gb.lang
@@ -74,7 +74,7 @@ maintenance_announcement_end_date_notice = Date until when the announcement shou
 maintenance_allowed_access_title = Exceptions
 
 maintenance_allowed_ips_label = List of allowed IP addresses
-maintenance_allowed_ips_notice = Enter IP address(es) that should still have access to the frontend. The current IP address is <code>{0}</code>.
+maintenance_allowed_ips_notice = Enter IP address(es) that should still have access to the frontend. The current IP address is <code>{0}</code>, the IP address of the server is <code>{1}</code>.
 
 maintenance_allowed_domains_label = List of allowed domains
 maintenance_allowed_domains_notice = Enter domains that should not be blocked.

diff --git a/pages/frontend.php b/pages/frontend.php
@@ -65,7 +65,7 @@
 // Erlaubte IP-Adressen
 $field = $form->addTextField('allowed_ips');
 $field->setLabel($addon->i18n('maintenance_allowed_ips_label'));
-$field->setNotice($addon->i18n('maintenance_allowed_ips_notice', \rex_server('REMOTE_ADDR', 'string', '')));
+$field->setNotice($addon->i18n('maintenance_allowed_ips_notice', \rex_server('REMOTE_ADDR', 'string', ''), \rex_server('SERVER_ADDR', 'string', '')));
 $field->setAttribute('class', 'form-control');
 $field->setAttribute('data-maintenance', 'tokenfield');
 $field->setAttribute('data-beautify', 'false');