diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-27 16:41:53 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-27 16:41:53 +0000 |
| commit | 0f41a3a6539309e70f7a5ec1affd594a3c514e80 (patch) | |
| tree | 2682da7645e72e9c758518d8a74d2c351daa456c /phpBB/includes | |
| parent | 4f3418bc25ef77ca641d469da9ec26f59b25b449 (diff) | |
| download | forums-0f41a3a6539309e70f7a5ec1affd594a3c514e80.tar forums-0f41a3a6539309e70f7a5ec1affd594a3c514e80.tar.gz forums-0f41a3a6539309e70f7a5ec1affd594a3c514e80.tar.bz2 forums-0f41a3a6539309e70f7a5ec1affd594a3c514e80.tar.xz forums-0f41a3a6539309e70f7a5ec1affd594a3c514e80.zip | |
Removed encoding of IP (now done in common)
git-svn-id: file:///svn/phpbb/trunk@348 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/sessions.php | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php index c22abf1aad..ba18c3c9fb 100644 --- a/phpBB/includes/sessions.php +++ b/phpBB/includes/sessions.php @@ -46,14 +46,13 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0 } $current_time = time(); $expiry_time = $current_time - $session_length; - $int_ip = encode_ip($user_ip); // // Initial ban check against IP and userid // $sql = "SELECT ban_ip, ban_userid FROM ".BANLIST_TABLE." - WHERE (ban_ip = '$int_ip' OR ban_userid = $user_id) + WHERE (ban_ip = '$user_ip' OR ban_userid = $user_id) AND (ban_start < $current_time AND ban_end > $current_time )"; $result = $db->sql_query($sql); if (!$result) @@ -85,7 +84,7 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0 if( ( $login || $autologin ) && $user_id != ANONYMOUS && $user_id != DELETED ) { $sql_delete_same_user = "DELETE FROM ".SESSIONS_TABLE." - WHERE session_ip <> '$int_ip' + WHERE session_ip <> '$user_ip' AND session_user_id = $user_id AND session_logged_in = 1"; $result = $db->sql_query($sql_delete_same_user); @@ -94,19 +93,19 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0 $sql_update = "UPDATE ".SESSIONS_TABLE." SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login WHERE (session_id = '".$sessiondata['sessionid']."') - AND (session_ip = '$int_ip')"; + AND (session_ip = '$user_ip')"; $result = $db->sql_query($sql_update); if(!$result || !$db->sql_affectedrows()) { mt_srand( (double) microtime() * 1000000); -// $session_id = md5(mt_rand()); +// $session_id = md5(mt_rand(uniqid)); // This is a superior but more intensive creation method $session_id = mt_rand(); $sql_insert = "INSERT INTO ".SESSIONS_TABLE." (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in) VALUES - ('$session_id', $user_id, $current_time, $current_time, '$int_ip', $page_id, $login)"; + ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)"; $result = $db->sql_query($sql_insert); if(!$result) { @@ -185,7 +184,6 @@ function session_pagestart($user_ip, $thispage_id, $session_length) $sessionmethod = SESSION_METHOD_GET; } $current_time = time(); - $int_ip = encode_ip($user_ip); unset($userdata); // @@ -227,7 +225,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length) $sql = "SELECT u.*, s.* FROM ".SESSIONS_TABLE." s, ".USERS_TABLE." u WHERE s.session_id = '".$sessiondata['sessionid']."' - AND s.session_ip = '$int_ip' + AND s.session_ip = '$user_ip' AND u.user_id = s.session_user_id"; $result = $db->sql_query($sql); if (!$result) @@ -258,7 +256,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length) // /* $sql = "SELECT ban_ip, ban_userid FROM ".BANLIST_TABLE." - WHERE (ban_ip = '$int_ip' OR ban_userid = '".$userdata['user_id']."') + WHERE (ban_ip = '$user_ip' OR ban_userid = '".$userdata['user_id']."') AND (ban_start < $current_time AND ban_end > $current_time )"; $ban_result = $db->sql_query($sql); if (!$ban_result) @@ -282,7 +280,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length) $sql = "UPDATE ".SESSIONS_TABLE." SET session_time = $current_time, session_page = $thispage_id WHERE (session_id = '".$userdata['session_id']."') - AND (session_ip = '$int_ip') + AND (session_ip = '$user_ip') AND (session_user_id = ".$userdata['user_id'].")"; $result = $db->sql_query($sql); if(!$result) |