[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.40,1.41

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

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

Modified Files:
	sessions.php 
Log Message:
Now with an added extra ... this one works, hopefully ... three days this was testing on phpbb.com with no problems ... I swear computers hate me

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** sessions.php	2001/12/14 02:39:44	1.40
--- sessions.php	2001/12/14 03:33:42	1.41
***************
*** 29,33 ****
  function session_begin($user_id, $user_ip, $page_id, $session_length, $auto_create = 0, $enable_autologin = 0)
  {
- 
  	global $db, $board_config;
  	global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
--- 29,32 ----
***************
*** 67,71 ****
  		// + the user_lastvisit ... damn damn damn damn and blast
  		//
! 		$sql = "SELECT user_autologin_key, user_session_time, user_email    
  			FROM " . USERS_TABLE . " 
  			WHERE user_id = $user_id";
--- 66,70 ----
  		// + the user_lastvisit ... damn damn damn damn and blast
  		//
! 		$sql = "SELECT user_password, user_session_time, user_email    
  			FROM " . USERS_TABLE . " 
  			WHERE user_id = $user_id";
***************
*** 78,82 ****
  		$row = $db->sql_fetchrow($result);
  
! 		$sessiondata['lastvisit'] = ( $row['user_session_time'] > 0 ) ? $row['user_session_time'] : $current_time; 
  
  		if( $auto_create )
--- 77,81 ----
  		$row = $db->sql_fetchrow($result);
  
! 		$auto_login_key = $row['user_password'];
  
  		if( $auto_create )
***************
*** 84,91 ****
  			if( isset($sessiondata['autologinid']) )
  			{
! 				if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
  				{
  					$login = 1;
! 					$enable_autologin = 1; 
  				}
  				else
--- 83,92 ----
  			if( isset($sessiondata['autologinid']) )
  			{
! 				if( $sessiondata['autologinid'] == $auto_login_key )
  				{
  					$login = 1;
! 					$enable_autologin = 1;
! 
! 					$sessiondata['lastvisit'] = ( $row['user_session_time'] > 0 ) ? $row['user_session_time'] : $current_time;
  				}
  				else
***************
*** 182,207 ****
  	if( $user_id != ANONYMOUS )
  	{
! 		$autologin_sql = "";
! 		if( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE )
! 		{
! 			mt_srand( (double) microtime() * 1000000);
! 			$autologin_key = md5(uniqid(mt_rand()));
! 
! 			$sessiondata['autologinid'] = $autologin_key;
! 			$autologin_sql = $autologin_key;
! 		}
! 		else
! 		{
! 			$autologin_sql = "";
! 		}
! 
! 		$sql_auto = "UPDATE " . USERS_TABLE . " 
! 			SET user_lastvisit = " . $sessiondata['lastvisit'] . ", user_session_time = $current_time, user_session_page = $page_id, user_autologin_key ='$autologin_id'   
! 			WHERE user_id = $user_id";
! 		$result = $db->sql_query($sql_auto);
! 		if(!$result)
! 		{
! 			message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
! 		}
  	}
  
--- 183,187 ----
  	if( $user_id != ANONYMOUS )
  	{
! 		$sessiondata['autologinid'] = ( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : "";
  	}
  
***************
*** 412,426 ****
  	if( $user_id != ANONYMOUS  )
  	{
! 		$autologin_sql = "";
! 		if( isset($sessiondata['autologinid']) && $sessionmethod = SESSION_METHOD_COOKIE )
  		{
  			unset($sessiondata['autologinid']);
- 			$autologin_sql = ", user_autologin_key = ''";
  		}
  
  		$sql = "UPDATE " . USERS_TABLE . "
! 			SET user_lastvisit = " . time() . $autologin_sql . " 
  			WHERE user_id = $user_id";
! 		$result = $db->sql_query($sql, END_TRANSACTION);
  		if (!$result)
  		{
--- 392,404 ----
  	if( $user_id != ANONYMOUS  )
  	{
! 		if( isset($sessiondata['autologinid']) && $sessionmethod == SESSION_METHOD_COOKIE )
  		{
  			unset($sessiondata['autologinid']);
  		}
  
  		$sql = "UPDATE " . USERS_TABLE . "
! 			SET user_lastvisit = " . time() . " 
  			WHERE user_id = $user_id";
! 		$result = $db->sql_query($sql);
  		if (!$result)
  		{