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

[ticket/9746] Ease up phpbb_ip_normalise() function.

Browse Source 
PHPBB3-9746
This commit is contained in:
Andreas Fischer
2010-08-03 11:07:40 +02:00
parent 2aa54bb156
commit 985151913c
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/includes/functions.php
View File

@@ -3310,27 +3310,8 @@ function phpbb_ip_normalise($address)
{
return $address;
}
else if (preg_match(get_preg_expression('ipv6'), $address))
{
$address = phpbb_inet_ntop(phpbb_inet_pton($address));
if (strpos($address, '::ffff:') === 0)
{
// IPv4-mapped address
$address_ipv4 = substr($address, 7);
if (preg_match(get_preg_expression('ipv4'), $address_ipv4))
{
return $address_ipv4;
}
return false;
}
return $address;
}
return false;
return phpbb_inet_ntop(phpbb_inet_pton($address));
}
/**