From 4f76dd8a569ef3355479568a31c601dd95b851d1 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 24 Dec 2016 13:46:30 +0100 Subject: [PATCH 1/2] Allow underscores in domain names --- php/savesettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/savesettings.php b/php/savesettings.php index ab5a7c94..f3004b9e 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -26,7 +26,7 @@ function istrue($argument) { // Credit: http://stackoverflow.com/a/4694816/2087442 function validDomain($domain_name) { - $validChars = preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name); + $validChars = preg_match("/^([a-z\d](-*[_a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name); $lengthCheck = preg_match("/^.{1,253}$/", $domain_name); $labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name); return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label From 5bda56edb1c66c0ae518ae56b0542158755259a5 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 24 Dec 2016 13:57:07 +0100 Subject: [PATCH 2/2] Domain validation: Allow underscore in subdomain and domain names. Prevent _ and - in TLD --- php/savesettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/savesettings.php b/php/savesettings.php index f3004b9e..5655e9bc 100644 --- a/php/savesettings.php +++ b/php/savesettings.php @@ -26,7 +26,7 @@ function istrue($argument) { // Credit: http://stackoverflow.com/a/4694816/2087442 function validDomain($domain_name) { - $validChars = preg_match("/^([a-z\d](-*[_a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $domain_name); + $validChars = preg_match("/^([_a-z\d](-*[_a-z\d])*)(\.([_a-z\d](-*[a-z\d])*))*(\.([a-z\d])*)+$/i", $domain_name); $lengthCheck = preg_match("/^.{1,253}$/", $domain_name); $labelLengthCheck = preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name); return ( $validChars && $lengthCheck && $labelLengthCheck ); //length of each label