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

correct validating list of AXFR-servers, fixes #1440

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-06-23 08:51:04 +02:00
parent 1c1affa7bd
commit addd70dfe8
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/functions/validate/function.validate_ip.php
View File

@@ -21,6 +21,7 @@
* Checks whether it is a valid ip
*
* @return mixed ip address on success, standard_error on failure
* @deprecated use validate_ip2
*/
function validate_ip($ip, $return_bool = false, $lng = 'invalidip') {
@@ -32,9 +33,32 @@ function validate_ip($ip, $return_bool = false, $lng = 'invalidip') {
return false;
} else {
standard_error($lng, $ip);
exit;
exit();
}
} else {
return $ip;
}
}
/**
* Checks whether it is a valid ip
*
* @return mixed ip address on success, false on failure
*/
function validate_ip2($ip, $return_bool = false, $lng = 'invalidip') {
if ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)
|| filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE | FILTER_FLAG_NO_PRIV_RANGE)
) {
return $ip;
}
if ($return_bool) {
return false;
} else {
standard_error($lng, $ip);
exit();
}
}