Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.58,1.58.2.1
|
From: Paul S. O. <ps...@us...> - 2002-04-08 16:45:26
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv2512/includes
Modified Files:
Tag: phpBB-2_0_0
sessions.php
Log Message:
Fix forgotten update of users table session info
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -C2 -r1.58 -r1.58.2.1
*** sessions.php 19 Mar 2002 11:59:36 -0000 1.58
--- sessions.php 8 Apr 2002 11:56:45 -0000 1.58.2.1
***************
*** 22,27 ****
//
- // session_begin()
- //
// Adds/updates a new session to the database for the given userid.
// Returns the new session ID on success.
--- 22,25 ----
***************
*** 55,60 ****
//
! // Try and pull the last time stored
! // in a cookie, if it exists
//
$sql = "SELECT *
--- 53,57 ----
//
! // Try and pull the last time stored in a cookie, if it exists
//
$sql = "SELECT *
***************
*** 82,87 ****
$login = 1;
$enable_autologin = 1;
-
- $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
}
else
--- 79,82 ----
***************
*** 103,107 ****
else
{
- $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
$login = 1;
}
--- 98,101 ----
***************
*** 147,151 ****
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
! if ( !($result = $db->sql_query($sql)) || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
--- 141,145 ----
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
! if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
***************
*** 154,160 ****
(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, '$user_ip', $page_id, $login)";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error creating new session : session_begin', '', __LINE__, __FILE__, $sql);
}
}
--- 148,154 ----
(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, '$user_ip', $page_id, $login)";
! if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
}
}
***************
*** 162,165 ****
--- 156,161 ----
if ( $user_id != ANONYMOUS )
{
+ // $last_visit = ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : ( ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time );
+
$sql = "UPDATE " . USERS_TABLE . "
SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit
***************
*** 167,171 ****
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating last visit time : session_begin', '', __LINE__, __FILE__, $sql);
}
--- 163,167 ----
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql);
}
***************
*** 186,191 ****
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
--- 182,185 ----
***************
*** 195,200 ****
//
! // Checks for a given user session, tidies session
! // table and updates user sessions at each page refresh
//
function session_pagestart($user_ip, $thispage_id)
--- 189,194 ----
//
! // Checks for a given user session, tidies session table and updates user
! // sessions at each page refresh
//
function session_pagestart($user_ip, $thispage_id)
***************
*** 207,211 ****
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
- $cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
$current_time = time();
--- 201,204 ----
***************
*** 241,245 ****
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch : session_pagestart', '', __LINE__, __FILE__, $sql);
}
--- 234,238 ----
if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
}
***************
*** 256,267 ****
// Only update session DB a minute or so after last update
//
! $last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
!
! if ( $current_time - $last_update > 60 )
! { // || $userdata['user_session_page'] != $thispage_id
! $sql = ( $userdata['user_id'] == ANONYMOUS ) ? "UPDATE " . SESSIONS_TABLE . " SET session_time = $current_time, session_page = $thispage_id WHERE session_id = '" . $userdata['session_id'] . "' AND session_ip = '$user_ip'" : "UPDATE " . USERS_TABLE . " SET user_session_time = $current_time, user_session_page = $thispage_id WHERE user_id = " . $userdata['user_id'];
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
}
--- 249,273 ----
// Only update session DB a minute or so after last update
//
! if ( $current_time - $userdata['session_time'] > 60 )
! {
! // || $userdata['user_session_page'] != $thispage_id
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
! }
!
! if ( $userdata['user_id'] != ANONYMOUS )
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_session_time = $current_time, user_session_page = $thispage_id
! WHERE user_id = " . $userdata['user_id'];
! if ( !$db->sql_query($sql) )
! {
! message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
! }
}
***************
*** 273,285 ****
WHERE session_time < $expiry_time
AND session_id <> '$session_id'";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error clearing sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
}
--- 279,289 ----
WHERE session_time < $expiry_time
AND session_id <> '$session_id'";
! if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
}
***************
*** 296,300 ****
if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
{
! message_die(CRITICAL_ERROR, 'Error creating user session : session_pagestart', '', __LINE__, __FILE__, $sql);
}
--- 300,304 ----
if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
{
! message_die(CRITICAL_ERROR, 'Error creating user session', '', __LINE__, __FILE__, $sql);
}
***************
*** 317,321 ****
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
- // $cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
//
--- 321,324 ----
***************
*** 339,356 ****
WHERE session_id = '$session_id'
AND session_user_id = $user_id";
! if ( !($result = $db->sql_query($sql)) )
{
! message_die(CRITICAL_ERROR, 'Error removing user session : session_end', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_data=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath. $cookiesecure);
- // header('Set-cookie: ' . $cookiename . '_sid=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
-
- $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
-
- return TRUE;
}
--- 342,354 ----
WHERE session_id = '$session_id'
AND session_user_id = $user_id";
! if ( !$db->sql_query($sql) )
{
! message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
+ return true;
}
***************
*** 373,375 ****
}
! ?>
--- 371,373 ----
}
! ?>
\ No newline at end of file
|
