diff options
| author | rubencm <rubencm@gmail.com> | 2019-10-24 19:32:47 +0000 |
|---|---|---|
| committer | rubencm <rubencm@gmail.com> | 2019-11-01 10:30:41 +0000 |
| commit | f09f5bc51c15eef526374105d6443270dc1172bf (patch) | |
| tree | 08981a746cbd9485fdff32d80d0ec99e06232c4d /phpBB/phpbb/session.php | |
| parent | ce35aa8b0b90870608a5b0782a36c6aedad8c7e4 (diff) | |
| download | forums-f09f5bc51c15eef526374105d6443270dc1172bf.tar forums-f09f5bc51c15eef526374105d6443270dc1172bf.tar.gz forums-f09f5bc51c15eef526374105d6443270dc1172bf.tar.bz2 forums-f09f5bc51c15eef526374105d6443270dc1172bf.tar.xz forums-f09f5bc51c15eef526374105d6443270dc1172bf.zip | |
[ticket/16189] Deprecate inet_ntop and inet_pton wrappers
PHPBB3-16189
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index ba200f38df..edd9e23c6b 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -311,49 +311,17 @@ class session foreach ($ips as $ip) { - if (function_exists('phpbb_ip_normalise')) - { - // Normalise IP address - $ip = phpbb_ip_normalise($ip); - - if (empty($ip)) - { - // IP address is invalid. - break; - } - - // IP address is valid. - $this->ip = $ip; + // Normalise IP address + $ip = phpbb_ip_normalise($ip); - // Skip legacy code. - continue; - } - - if (preg_match(get_preg_expression('ipv4'), $ip)) - { - $this->ip = $ip; - } - else if (preg_match(get_preg_expression('ipv6'), $ip)) + if ($ip === false) { - // Quick check for IPv4-mapped address in IPv6 - if (stripos($ip, '::ffff:') === 0) - { - $ipv4 = substr($ip, 7); - - if (preg_match(get_preg_expression('ipv4'), $ipv4)) - { - $ip = $ipv4; - } - } - - $this->ip = $ip; - } - else - { - // We want to use the last valid address in the chain - // Leave foreach loop when address is invalid + // IP address is invalid. break; } + + // IP address is valid. + $this->ip = $ip; } $this->load = false; |