[mxbb-commits] core/includes/sessions/internal core.php, 1.5, 1.6 session.php, 1.13, 1.14

[Jon O. <jon...@us...>]

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

Modified Files:
	core.php session.php 
Log Message:
Removed mx_functions_phpbb.php -> backend loaded.

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** core.php	11 Jul 2008 23:03:30 -0000	1.5
--- core.php	12 Jul 2008 20:24:15 -0000	1.6
***************
*** 207,216 ****
  
  	/**
! 	 * _load_file
  	 *
  	 * @param unknown_type $force_shared
  	 * @access private
  	 */
! 	function _load_file($force_shared)
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx;
--- 207,216 ----
  
  	/**
! 	 * load_file
  	 *
  	 * @param unknown_type $force_shared
  	 * @access private
  	 */
! 	function load_file($force_shared)
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx;
***************
*** 231,234 ****
--- 231,265 ----
  
  	/**
+ 	 * dss_rand
+ 	 *
+ 	 * @param unknown_type $force_shared
+ 	 * @access private
+ 	 */
+ 	function dss_rand($force_shared)
+ 	{
+ 		global $db, $portal_config, $board_config, $dss_seeded;
+ 
+ 		$val = $portal_config['rand_seed'] . microtime();
+ 		$val = md5($val);
+ 		$portal_config['rand_seed'] = md5($portal_config['rand_seed'] . $val . 'a');
+ 
+ 		if($dss_seeded !== true)
+ 		{
+ 			$sql = "UPDATE " . PORTAL_TABLE . " SET
+ 				rand_seed = '" . $portal_config['rand_seed'] . "'
+ 				WHERE portal_id = '1'";
+ 
+ 			if( !$db->sql_query($sql) )
+ 			{
+ 				mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql);
+ 			}
+ 
+ 			$dss_seeded = true;
+ 		}
+ 
+ 		return substr($val, 4, 16);
+ 	}
+ 
+ 	/**
  	 * Backend specific Page Header data
  	 *

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** session.php	10 Jul 2008 23:40:53 -0000	1.13
--- session.php	12 Jul 2008 20:24:15 -0000	1.14
***************
*** 35,41 ****
  	var $update_session_page = true;
  
- 	//
- 	// phpBB3 duplicates
- 	//
  	var $lang = array();
  	var $help = array();
--- 35,38 ----
***************
*** 80,84 ****
  	function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0, $admin = 0)
  	{
! 		global $db, $board_config;
  		global $mx_request_vars, $SID;
  
--- 77,81 ----
  	function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_autologin = 0, $admin = 0)
  	{
! 		global $db, $board_config, $mx_backend;
  		global $mx_request_vars, $SID;
  
***************
*** 233,237 ****
  		if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
  		{
! 			$session_id = md5(mx_dss_rand());
  
  			$sql = "INSERT INTO " . SESSIONS_TABLE . "
--- 230,234 ----
  		if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
  		{
! 			$session_id = md5($mx_backend->dss_rand());
  
  			$sql = "INSERT INTO " . SESSIONS_TABLE . "
***************
*** 266,270 ****
  			if ($enable_autologin)
  			{
! 				$auto_login_key = mx_dss_rand() . mx_dss_rand();
  
  				if (isset($sessiondata['autologinid']) && (string) $sessiondata['autologinid'] != '')
--- 263,267 ----
  			if ($enable_autologin)
  			{
! 				$auto_login_key = $mx_backend->dss_rand() . $mx_backend->dss_rand();
  
  				if (isset($sessiondata['autologinid']) && (string) $sessiondata['autologinid'] != '')
***************
*** 560,564 ****
  	function session_reset_keys($user_id, $user_ip)
  	{
! 		global $db, $userdata, $board_config;
  
  		$key_sql = ($user_id == $userdata['user_id'] && !empty($userdata['session_key'])) ? "AND key_id != '" . md5($userdata['session_key']) . "'" : '';
--- 557,561 ----
  	function session_reset_keys($user_id, $user_ip)
  	{
! 		global $db, $userdata, $board_config, $mx_backend;
  
  		$key_sql = ($user_id == $userdata['user_id'] && !empty($userdata['session_key'])) ? "AND key_id != '" . md5($userdata['session_key']) . "'" : '';
***************
*** 584,588 ****
  		if ( !empty($key_sql) )
  		{
! 			$auto_login_key = mx_dss_rand() . mx_dss_rand();
  
  			$current_time = time();
--- 581,585 ----
  		if ( !empty($key_sql) )
  		{
! 			$auto_login_key = $mx_backend->dss_rand() . $mx_backend->dss_rand();
  
  			$current_time = time();