diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-03-09 23:38:13 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2001-03-09 23:38:13 +0000 |
| commit | 66bc8a309b5262e229b5a6ac952ad795d3b07a85 (patch) | |
| tree | 831285d3bf6c5ec735d026357d7e4f37f88ca002 | |
| parent | d3d031d9eec485a05afdcc367ca8a8cca24e98e5 (diff) | |
| download | forums-66bc8a309b5262e229b5a6ac952ad795d3b07a85.tar forums-66bc8a309b5262e229b5a6ac952ad795d3b07a85.tar.gz forums-66bc8a309b5262e229b5a6ac952ad795d3b07a85.tar.bz2 forums-66bc8a309b5262e229b5a6ac952ad795d3b07a85.tar.xz forums-66bc8a309b5262e229b5a6ac952ad795d3b07a85.zip | |
Changed USER_IP to $user_ip
git-svn-id: file:///svn/phpbb/trunk@95 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/common.php | 8 | ||||
| -rw-r--r-- | phpBB/login.php | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index c79b681fba..8152b1aa4e 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -26,9 +26,7 @@ include('config.'.$phpEx); include('includes/constants.'.$phpEx); // Find Users real IP (if possible) -$ip = ($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_ADDR; -define("USER_IP",$ip); -unset($ip); +$user_ip = ($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_ADDR; // Setup what template to use. Currently just use default include('includes/template.inc'); @@ -71,7 +69,7 @@ else include('language/lang_'.$default_lang.'.'.$phpEx); // Check if user is banned -if(!auth("ip ban", $db, "", USER_IP)) +if(!auth("ip ban", $db, "", $user_ip)) { error_die($db, BANNED); } @@ -79,7 +77,7 @@ if(!auth("ip ban", $db, "", USER_IP)) if(isset($HTTP_COOKIE_VARS[$session_cookie])) { $sessid = $HTTP_COOKIE_VARS[$session_cookie]; - $userid = get_userid_from_session($sessid, $session_cookie_time, USER_IP, $db); + $userid = get_userid_from_session($sessid, $session_cookie_time, $user_ip, $db); if ($userid) { diff --git a/phpBB/login.php b/phpBB/login.php index da6d49f59f..8d35255036 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -39,7 +39,7 @@ if($submit) } else { - $sessid = new_session($userdata[user_id], USER_IP, $session_cookie_time, $db); + $sessid = new_session($userdata[user_id], $user_ip, $session_cookie_time, $db); set_session_cookie($sessid, $session_cookie_time, $session_cookie, "", "", 0); header("Location: index.$phpEx"); } |