diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-05-09 14:08:41 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-05-09 14:08:41 +0000 |
| commit | f6c6628509a3d055f9736df248693f61d5c5b701 (patch) | |
| tree | 0c8c7682812a00d09dd1d8f2d5ddbfc6cb844e32 /phpBB/common.php | |
| parent | ab8d9f197830d0787bb448128d77c141147176aa (diff) | |
| download | forums-f6c6628509a3d055f9736df248693f61d5c5b701.tar forums-f6c6628509a3d055f9736df248693f61d5c5b701.tar.gz forums-f6c6628509a3d055f9736df248693f61d5c5b701.tar.bz2 forums-f6c6628509a3d055f9736df248693f61d5c5b701.tar.xz forums-f6c6628509a3d055f9736df248693f61d5c5b701.zip | |
IP related updates
git-svn-id: file:///svn/phpbb/trunk@2560 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 540164a86e..1169bd6cf0 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -294,19 +294,18 @@ $nav_links['author'] = array ( // if( getenv('HTTP_X_FORWARDED_FOR') != '' ) { - $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR ); + $user_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR ); if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) ) { $private_ip = array('/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10..*/', '/^224..*/', '/^240..*/'); - $client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]); + $user_ip = preg_replace($private_ip, $client_ip, $ip_list[1]); } } else { - $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR ); + $user_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR ); } -$user_ip = encode_ip($client_ip); // // Setup forum wide options, if this fails |