[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.43,1.44

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11332/includes

Modified Files:
	sessions.php 
Log Message:
Doh, might help if the users data was updated when a new session is created ...

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** sessions.php	2001/12/15 11:30:41	1.43
--- sessions.php	2001/12/15 14:37:01	1.44
***************
*** 119,127 ****
  	}
  
- 	if( empty($sessiondata['lastvisit']) )
- 	{
- 		$sessiondata['lastvisit'] = $current_time;
- 	}
- 
  	//
  	// Initial ban check against user id, IP and email address
--- 119,122 ----
***************
*** 157,174 ****
  	// Create or update the session
  	//
! 	$sql_update = "UPDATE " . SESSIONS_TABLE . "
! 		SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login
  		WHERE session_id = '" . $session_id . "' 
  			AND session_ip = '$user_ip'";
! 	$result = $db->sql_query($sql_update);
  
! 	if(!$result || !$db->sql_affectedrows())
  	{
  		$session_id = md5(uniqid($user_ip));
  
! 		$sql_insert = "INSERT INTO " . SESSIONS_TABLE . "
  			(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
  			VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! 		$result = $db->sql_query($sql_insert);
  		if(!$result)
  		{
--- 152,169 ----
  	// Create or update the session
  	//
! 	$sql = "UPDATE " . SESSIONS_TABLE . "
! 		SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_page = $page_id, session_logged_in = $login
  		WHERE session_id = '" . $session_id . "' 
  			AND session_ip = '$user_ip'";
! 	$result = $db->sql_query($sql);
  
! 	if( !$result || !$db->sql_affectedrows() )
  	{
  		$session_id = md5(uniqid($user_ip));
  
! 		$sql = "INSERT INTO " . SESSIONS_TABLE . "
  			(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
  			VALUES ('$session_id', $user_id, $current_time, $current_time, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! 		$result = $db->sql_query($sql);
  		if(!$result)
  		{
***************
*** 179,182 ****
--- 174,185 ----
  	if( $user_id != ANONYMOUS )
  	{
+ 		$sql = "UPDATE " . USERS_TABLE . " 
+ 			SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = " . $sessiondata['lastvisit'] . "
+ 			WHERE user_id = $user_id";
+ 		if( !$db->sql_query($sql) )
+ 		{
+ 			message_die(CRITICAL_ERROR, "Error updating last visit time : session_begin", "", __LINE__, __FILE__, $sql);
+ 		}
+ 
  		$sessiondata['autologinid'] = ( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : "";
  	}
***************
*** 403,407 ****
  
  	$sessiondata['userid'] = ANONYMOUS;
- 	$sessiondata['lastvisit'] = $current_time;
  
  	$serialised_cookiedata = serialize($sessiondata);
--- 406,409 ----
***************
*** 434,436 ****
  }
  
! ?>
--- 436,438 ----
  }
  
! ?>
\ No newline at end of file