mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2018-10-20 20:19:15 -04:00
parent 2ba87f06b2 ae6c3b0d34
commit ee3d3fbf41
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions_user.php
View File

@@ -1429,21 +1429,14 @@ function user_ipwhois($ip)
return ''; return '';
} }
if (preg_match(get_preg_expression('ipv4'), $ip)) if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $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
{ {
return ''; return '';
} }
// IPv4 & IPv6 addresses
$whois_host = 'whois.arin.net.';
$ipwhois = ''; $ipwhois = '';
if (($fsk = @fsockopen($whois_host, 43))) if (($fsk = @fsockopen($whois_host, 43)))