[mxbb-commits] core/includes/sessions/phpbb2 session.php,1.4,1.5

[MW <jo...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb2
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10350/includes/sessions/phpbb2

Modified Files:
	session.php 
Log Message:
Upgrading old type $HTML_*_VARS

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** session.php	9 Feb 2008 17:14:33 -0000	1.4
--- session.php	9 Feb 2008 19:42:38 -0000	1.5
***************
*** 53,57 ****
  {
  	global $db, $board_config;
! 	global $HTTP_COOKIE_VARS, $mx_request_vars, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 53,57 ----
  {
  	global $db, $board_config;
! 	global $mx_request_vars, $SID;
  
  	$cookiename = $board_config['cookie_name'];
***************
*** 60,67 ****
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
! 		$session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
! 		$sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array();
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 60,67 ----
  	$cookiesecure = $board_config['cookie_secure'];
  
! 	if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) )
  	{
! 		$session_id = isset($_COOKIE[$cookiename . '_sid']) ? $_COOKIE[$cookiename . '_sid'] : '';
! 		$sessiondata = isset($_COOKIE[$cookiename . '_data']) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array();
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 297,301 ****
  {
  	global $db, $lang, $board_config;
! 	global $HTTP_COOKIE_VARS, $mx_request_vars, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 297,301 ----
  {
  	global $db, $lang, $board_config;
! 	global $mx_request_vars, $SID;
  
  	$cookiename = $board_config['cookie_name'];
***************
*** 307,314 ****
  	unset($userdata);
  
! 	if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) )
  	{
! 		$sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array();
! 		$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
--- 307,314 ----
  	unset($userdata);
  
! 	if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) )
  	{
! 		$sessiondata = isset( $_COOKIE[$cookiename . '_data'] ) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array();
! 		$session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : '';
  		$sessionmethod = SESSION_METHOD_COOKIE;
  	}
***************
*** 432,436 ****
  {
  	global $db, $lang, $board_config, $userdata;
! 	global $HTTP_COOKIE_VARS, $SID;
  
  	$cookiename = $board_config['cookie_name'];
--- 432,436 ----
  {
  	global $db, $lang, $board_config, $userdata;
! 	global $SID;
  
  	$cookiename = $board_config['cookie_name'];