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

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

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

Modified Files:
	sessions.php 
Log Message:
Altered update/insert procedure back to what it was ... otherwise no session_id is available for install

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** sessions.php	2001/12/14 03:33:42	1.41
--- sessions.php	2001/12/14 14:22:26	1.42
***************
*** 154,181 ****
  	// Create or update the session
  	//
! 	if( !$auto_create )
! 	{
! 		$sql = "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);
! 		if(!$result)
! 		{
! 			message_die(CRITICAL_ERROR, "Error updating current session : session_begin", "", __LINE__, __FILE__, $sql);
! 		}
! 	}
! 	else
  	{
! 		mt_srand( (double) microtime() * 1000000);
! 		$session_id = md5(uniqid(mt_rand()));
  
! 		$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)
  		{
! 			message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
  		}
  	}
--- 154,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)
  		{
! 			message_die(CRITICAL_ERROR, "Error creating new session : session_begin", __LINE__, __FILE__, $sql);
  		}
  	}
***************
*** 273,277 ****
  						SET session_time = $current_time, session_page = $thispage_id 
  						WHERE session_id = '" . $userdata['session_id'] . "' 
- 							AND session_user_id = " . $userdata['user_id'] . " 
  							AND session_ip = '$user_ip'";
  				}
--- 266,269 ----
***************
*** 282,287 ****
  						WHERE user_id = " . $userdata['user_id'];
  				}
! 				$result = $db->sql_query($sql);
! 				if( !$result )
  				{
  					message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
--- 274,278 ----
  						WHERE user_id = " . $userdata['user_id'];
  				}
! 				if( !$db->sql_query($sql) )
  				{
  					message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);