makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed encoding of IP (now done in common)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@348 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-05-27 16:41:53 +00:00
parent 4f3418bc25
commit 0f41a3a653
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/sessions.php
View file

@ -46,14 +46,13 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
} }
$current_time = time(); $current_time = time();
$expiry_time = $current_time - $session_length; $expiry_time = $current_time - $session_length;
$int_ip = encode_ip($user_ip);
// //
// Initial ban check against IP and userid // Initial ban check against IP and userid
// //
$sql = "SELECT ban_ip, ban_userid $sql = "SELECT ban_ip, ban_userid
FROM ".BANLIST_TABLE." 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 )"; AND (ban_start < $current_time AND ban_end > $current_time )";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$result) 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 ) if( ( $login || $autologin ) && $user_id != ANONYMOUS && $user_id != DELETED )
{ {
$sql_delete_same_user = "DELETE FROM ".SESSIONS_TABLE." $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_user_id = $user_id
AND session_logged_in = 1"; AND session_logged_in = 1";
$result = $db->sql_query($sql_delete_same_user); $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." $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 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']."') WHERE (session_id = '".$sessiondata['sessionid']."')
AND (session_ip = '$int_ip')"; AND (session_ip = '$user_ip')";
$result = $db->sql_query($sql_update); $result = $db->sql_query($sql_update);
if(!$result || !$db->sql_affectedrows()) if(!$result || !$db->sql_affectedrows())
{ {
mt_srand( (double) microtime() * 1000000); 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(); $session_id = mt_rand();
$sql_insert = "INSERT INTO ".SESSIONS_TABLE." $sql_insert = "INSERT INTO ".SESSIONS_TABLE."
(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in) (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
VALUES 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); $result = $db->sql_query($sql_insert);
if(!$result) if(!$result)
{ {
@ -185,7 +184,6 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
$sessionmethod = SESSION_METHOD_GET; $sessionmethod = SESSION_METHOD_GET;
} }
$current_time = time(); $current_time = time();
$int_ip = encode_ip($user_ip);
unset($userdata); unset($userdata);
// //
@ -227,7 +225,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
$sql = "SELECT u.*, s.* $sql = "SELECT u.*, s.*
FROM ".SESSIONS_TABLE." s, ".USERS_TABLE." u FROM ".SESSIONS_TABLE." s, ".USERS_TABLE." u
WHERE s.session_id = '".$sessiondata['sessionid']."' 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"; AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if (!$result) if (!$result)
@ -258,7 +256,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
// //
/* $sql = "SELECT ban_ip, ban_userid /* $sql = "SELECT ban_ip, ban_userid
FROM ".BANLIST_TABLE." 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 )"; AND (ban_start < $current_time AND ban_end > $current_time )";
$ban_result = $db->sql_query($sql); $ban_result = $db->sql_query($sql);
if (!$ban_result) if (!$ban_result)
@ -282,7 +280,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
$sql = "UPDATE ".SESSIONS_TABLE." $sql = "UPDATE ".SESSIONS_TABLE."
SET session_time = $current_time, session_page = $thispage_id SET session_time = $current_time, session_page = $thispage_id
WHERE (session_id = '".$userdata['session_id']."') WHERE (session_id = '".$userdata['session_id']."')
AND (session_ip = '$int_ip') AND (session_ip = '$user_ip')
AND (session_user_id = ".$userdata['user_id'].")"; AND (session_user_id = ".$userdata['user_id'].")";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if(!$result) if(!$result)