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

allow ip:port in redirections, fixes #1173

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-12 19:26:21 +01:00
parent b5fb0da98f
commit 4d0dfb1c88
2 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,25 +22,19 @@
*
* @return mixed ip address on success, standard_error on failure
*/
function validate_ip($ip, $return_bool = false, $lng = 'invalidip') {
function validate_ip($ip, $return_bool = false, $lng = 'invalidip')
{
if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === FALSE
&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === FALSE
&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === FALSE)
{
if($return_bool)
{
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false
&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false
&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === false
) {
if ($return_bool) {
return false;
}
else
{
} else {
standard_error($lng, $ip);
exit;
}
}
else
{
} else {
return $ip;
}
}