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

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

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

Modified Files:
	sessions.php 
Log Message:
Various changes to accompany session updates ... MSSQL users should be prepared to alter or remove the session_last_visit field or face potential problems

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** sessions.php	2001/12/15 14:37:01	1.44
--- sessions.php	2001/12/15 16:40:35	1.45
***************
*** 153,157 ****
  	//
  	$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'";
--- 153,157 ----
  	//
  	$sql = "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 = '" . $session_id . "' 
  			AND session_ip = '$user_ip'";
***************
*** 163,168 ****
  
  		$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)
--- 163,168 ----
  
  		$sql = "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, '$user_ip', $page_id, $login)";
  		$result = $db->sql_query($sql);
  		if(!$result)
***************
*** 183,190 ****
  
  		$sessiondata['autologinid'] = ( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : "";
  	}
  
- 	$sessiondata['userid'] = $user_id;
- 
  	$serialised_cookiedata = serialize($sessiondata);
  	setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
--- 183,189 ----
  
  		$sessiondata['autologinid'] = ( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : "";
+ 		$sessiondata['userid'] = $user_id;
  	}
  
  	$serialised_cookiedata = serialize($sessiondata);
  	setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
***************
*** 393,409 ****
  			unset($sessiondata['autologinid']);
  		}
- 
- 		$sql = "UPDATE " . USERS_TABLE . "
- 			SET user_lastvisit = " . time() . " 
- 			WHERE user_id = $user_id";
- 		$result = $db->sql_query($sql);
- 		if (!$result)
- 		{
- 			message_die(CRITICAL_ERROR, "Couldn't reset user autologin key : session_end", "", __LINE__, __FILE__, $sql);
- 		}
- 
  	}
  
! 	$sessiondata['userid'] = ANONYMOUS;
  
  	$serialised_cookiedata = serialize($sessiondata);
--- 392,398 ----
  			unset($sessiondata['autologinid']);
  		}
  	}
  
! 	unset($sessiondata['userid']);
  
  	$serialised_cookiedata = serialize($sessiondata);