diff options
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 15 | 
1 files changed, 4 insertions, 11 deletions
| diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 2677916a7d..d019b867fa 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1429,21 +1429,14 @@ function user_ipwhois($ip)  		return '';  	} -	if (preg_match(get_preg_expression('ipv4'), $ip)) -	{ -		// IPv4 address -		$whois_host = 'whois.arin.net.'; -	} -	else if (preg_match(get_preg_expression('ipv6'), $ip)) -	{ -		// IPv6 address -		$whois_host = 'whois.sixxs.net.'; -	} -	else +	if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))  	{  		return '';  	} +	// IPv4 & IPv6 addresses +	$whois_host = 'whois.arin.net.'; +  	$ipwhois = '';  	if (($fsk = @fsockopen($whois_host, 43))) | 
