From 12884c91a67c21b7a5bfaf2acec14335b6a7e738 Mon Sep 17 00:00:00 2001 From: Pascal Date: Fri, 3 May 2019 22:32:57 +0200 Subject: [PATCH] #564 fix #564 by allowing CIDR in mysql host validation. fix english and german field description accordingly --- lib/Froxlor/Validate/Check.php | 2 +- lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Validate/Check.php b/lib/Froxlor/Validate/Check.php index 41901d31..147afb5a 100644 --- a/lib/Froxlor/Validate/Check.php +++ b/lib/Froxlor/Validate/Check.php @@ -78,7 +78,7 @@ class Check foreach ($mysql_access_host_array as $host_entry) { - if (Validate::validate_ip2($host_entry, true, 'invalidip', true, true) == false && Validate::validateDomain($host_entry) == false && Validate::validateLocalHostname($host_entry) == false && $host_entry != '%') { + if (Validate::validate_ip2($host_entry, true, 'invalidip', true, true, true) == false && Validate::validateDomain($host_entry) == false && Validate::validateLocalHostname($host_entry) == false && $host_entry != '%') { return array( self::FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'invalidmysqlhost', diff --git a/lng/english.lng.php b/lng/english.lng.php index 45bced52..f6e342ec 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -569,7 +569,7 @@ $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Where should $lng['error']['formtokencompromised'] = 'The request seems to be compromised. For security reasons you were logged out.'; $lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts'; -$lng['serversettings']['mysql_access_host']['description'] = 'A comma separated list of hosts from which users should be allowed to connect to the MySQL-Server.'; +$lng['serversettings']['mysql_access_host']['description'] = 'A comma separated list of hosts from which users should be allowed to connect to the MySQL-Server. To allow a subnet, CIDR syntax like 100.127.0.0/255.255.0.0 or 10.10.10.10/16 is valid.'; // ADDED IN 1.2.18-svn1 diff --git a/lng/german.lng.php b/lng/german.lng.php index 551ff001..d57fa638 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -564,7 +564,7 @@ $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Wo sollen die $lng['error']['formtokencompromised'] = 'Das Formular scheint manipuliert worden zu sein. Aus Sicherheitsgründen wurden Sie ausgelogged.'; $lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts'; -$lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma getrennte Liste mit den Hostnamen aller Hostnames/IP-Adressen, von denen sich die Benutzer einloggen dürfen.'; +$lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma getrennte Liste mit den Hostnamen aller Hostnames/IP-Adressen, von denen sich die Benutzer einloggen dürfen. Um ein Subnetz zu erlauben, die CIDR Schreibweise (Beispiel 100.127.0.0/255.255.0.0 oder 10.10.10.10/16) ist erlaubt.'; // ADDED IN 1.2.18-svn1