diff options
| author | Savetheinternet <savetheinternet@tinyboard.org> | 2011-11-25 03:02:34 +1100 |
|---|---|---|
| committer | Savetheinternet <savetheinternet@tinyboard.org> | 2011-11-25 03:02:34 +1100 |
| commit | 8c2f6d978a69e53c91c831eb47d1a6f686aa9a08 (patch) | |
| tree | b466e6b0143ce4a177e9ff0872499f0f5d24ac9c /inc/functions.php | |
| parent | 40bc60209693b34def64e076ee1d17f2b632d6c5 (diff) | |
Automatic transformation of IPv6-IPv4 addresses (::ffff:0.0.0.0) should not be an optional feature.
Diffstat (limited to 'inc/functions.php')
| -rw-r--r-- | inc/functions.php | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/inc/functions.php b/inc/functions.php index a40e55eb..c79e3a68 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -97,15 +97,13 @@ ini_set('display_errors', 1); } - if($config['ipv6_ipv4'] && isset($_SERVER['REMOTE_ADDR'])) { - // Keep the original address to properly comply with other board configurations - if(!isset($__ip)) - $__ip = &$_SERVER['REMOTE_ADDR']; - - // ::ffff:0.0.0.0 - if(preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m)) - $_SERVER['REMOTE_ADDR'] = $m[2]; - } + // Keep the original address to properly comply with other board configurations + if(!isset($__ip)) + $__ip = $_SERVER['REMOTE_ADDR']; + + // ::ffff:0.0.0.0 + if(preg_match('/^\:\:(ffff\:)?(\d+\.\d+\.\d+\.\d+)$/', $__ip, $m)) + $_SERVER['REMOTE_ADDR'] = $m[2]; if(_setlocale(LC_ALL, $config['locale']) === false) { $error = function_exists('error') ? 'error' : 'basic_error_function_because_the_other_isnt_loaded_yet'; |