From 32385e580de530f48fcc48d0e8270f638d08f004 Mon Sep 17 00:00:00 2001 From: prij Date: Tue, 12 Sep 2017 07:20:42 +1200 Subject: [PATCH] Excluded colon from domain field validation --- src/Forms/WildcardDomainField.php | 2 +- tests/php/WildcardDomainFieldTest.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Forms/WildcardDomainField.php b/src/Forms/WildcardDomainField.php index 6575a44..c20f0e6 100644 --- a/src/Forms/WildcardDomainField.php +++ b/src/Forms/WildcardDomainField.php @@ -36,7 +36,7 @@ class WildcardDomainField extends TextField */ public function checkHostname($hostname) { - return (bool)preg_match('/^([a-z0-9\*]+[\-\.])*([a-z0-9\*]+)$/', $hostname); + return (bool)preg_match('/^([a-z0-9\*]+[\-\.\:])*([a-z0-9\*]+)$/', $hostname); } public function Type() diff --git a/tests/php/WildcardDomainFieldTest.php b/tests/php/WildcardDomainFieldTest.php index 20a7fb6..2505d6c 100644 --- a/tests/php/WildcardDomainFieldTest.php +++ b/tests/php/WildcardDomainFieldTest.php @@ -54,7 +54,9 @@ class WildcardDomainFieldTest extends SapphireTest ['domain7'], ['mysite.co.n-z'], ['subdomain.my-site.com'], - ['subdomain.mysite'] + ['subdomain.mysite'], + ['subdomain.mysite.com:80'], + ['mysite:80'] ]; } @@ -70,7 +72,8 @@ class WildcardDomainFieldTest extends SapphireTest ['.mysite.*'], ['mys..ite.*'], ['*.mysite-'], - ['*.mysite.'] + ['*.mysite.'], + [':1234'] ]; }