[Phpbb-checkins] CVS: phpBB2/includes sessions.php,1.32,1.33

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

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

Modified Files:
	sessions.php 
Log Message:
Session code update to support temporary cookies only

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** sessions.php	2001/09/13 23:19:25	1.32
--- sessions.php	2001/10/14 15:48:18	1.33
***************
*** 38,45 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename]) )
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 38,45 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename]) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 47,51 ****
  	else
  	{
! 		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
--- 47,51 ----
  	else
  	{
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
***************
*** 177,184 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if(isset($HTTP_COOKIE_VARS[$cookiename]))
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 177,185 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
! 
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 186,189 ****
--- 187,191 ----
  	{
  		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
+ 
  		$sessionmethod = SESSION_METHOD_GET;
  	}
***************
*** 214,218 ****
  		$sql = "SELECT u.*, s.*
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
! 			WHERE s.session_id = '" . addslashes($session_id) . "'
  				AND s.session_ip = '$user_ip'
  				AND u.user_id = s.session_user_id";
--- 216,220 ----
  		$sql = "SELECT u.*, s.*
  			FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
! 			WHERE s.session_id = '$session_id'
  				AND s.session_ip = '$user_ip'
  				AND u.user_id = s.session_user_id";
***************
*** 228,232 ****
  		// Did the session exist in the DB?
  		//
! 		if(isset($userdata['user_id']))
  		{
  			$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
--- 230,234 ----
  		// Did the session exist in the DB?
  		//
! 		if( isset($userdata['user_id']) )
  		{
  			$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
***************
*** 356,363 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if(isset($HTTP_COOKIE_VARS[$cookiename]))
  	{
! 		$sessiondata = unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename]));
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
--- 358,365 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
  	{
! 		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename])) : "";
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? stripslashes($HTTP_COOKIE_VARS[$cookiename . '_sid']) : "";
  
  		$sessionmethod = SESSION_METHOD_COOKIE;
***************
*** 365,369 ****
  	else
  	{
! 		$session_id = (isset($HTTP_GET_VARS['sid'])) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
--- 367,371 ----
  	else
  	{
! 		$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : "";
  
  		$sessionmethod = SESSION_METHOD_GET;
***************
*** 382,386 ****
  	}
  
! 	if($sessiondata['autologinid'])
  	{
  		$sql = "UPDATE " . USERS_TABLE . "
--- 384,388 ----
  	}
  
! 	if( isset($sessiondata['autologinid']) )
  	{
  		$sql = "UPDATE " . USERS_TABLE . "