From 7a69cf73bad6003bb51d0ac3f05ce50d2e94f76f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 23 Apr 2013 15:58:03 +0200 Subject: [PATCH] don't require a port-declaration in validating an URL when an IP address is given, fixes #1179 Signed-off-by: Michael Kaufmann (d00p) --- lib/functions/validate/function.validateUrl.php | 5 ++++- scripts/jobs/cron_tasks.inc.dns.10.bind.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/functions/validate/function.validateUrl.php b/lib/functions/validate/function.validateUrl.php index 0c4be8bf..07ce29ac 100644 --- a/lib/functions/validate/function.validateUrl.php +++ b/lib/functions/validate/function.validateUrl.php @@ -58,7 +58,10 @@ function validateUrl($url) { $ip = substr($ip, 0, strpos($ip, '/')); // possible : in IP (when a port is given), #1173 - $ip = substr($ip, 0, strpos($ip, ':')); + // but only if there actually IS ONE + if (strpos($ip, ':') !== false) { + $ip = substr($ip, 0, strpos($ip, ':')); + } if (validate_ip($ip, true) !== false) { return true; diff --git a/scripts/jobs/cron_tasks.inc.dns.10.bind.php b/scripts/jobs/cron_tasks.inc.dns.10.bind.php index 5d715483..45d719ca 100644 --- a/scripts/jobs/cron_tasks.inc.dns.10.bind.php +++ b/scripts/jobs/cron_tasks.inc.dns.10.bind.php @@ -137,7 +137,7 @@ class bind } } // close allow-transfer - $bindconf_file.= '};' . "\n"; + $bindconf_file.= ' };' . "\n"; } $bindconf_file.= '};' . "\n";