maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

remove inner if statement

Browse Source 
check ipv6 when cidr>netmask flag is set
This commit is contained in:
Pascal
2019-10-28 16:32:52 +01:00
parent 7774e7606d
commit 9c4d619840
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Validate/Validate.php
View File

@@ -126,11 +126,9 @@ class Validate
if(strlen($ip_cidr[1]) <= 2 && in_array((int)$ip_cidr[1], array_values(range(1, 32)), TRUE) === false) {
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
}
if (self::is_ipv6($ip)) {
if ($cidr_as_netmask && self::is_ipv6($ip)) {
//MySQL does not handle CIDR of IPv6 addresses, return error
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
}
\Froxlor\UI\Response::standard_error($lng, $ip, $throw_exception);
}
$ip = $ip_cidr[0];
if ($cidr_as_netmask && strlen($ip_cidr[1]) <= 2) {