[mxbb-commits] core/includes/sessions/phpbb3 core.php,1.18,1.19

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14876/includes/sessions/phpbb3

Modified Files:
	core.php 
Log Message:
update

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** core.php	31 Oct 2008 18:54:23 -0000	1.18
--- core.php	28 Sep 2009 11:24:28 -0000	1.19
***************
*** 184,188 ****
  		global $table_prefix, $phpEx, $tplEx;
  
! 		$table_prefix = '';
  
  		//
--- 184,188 ----
  		global $table_prefix, $phpEx, $tplEx;
  
! 		$table_prefix = false;
  
  		//
***************
*** 196,211 ****
  		// Load phpbb config.php (to get table prefix)
  		//
! 		include_once($phpbb_root_path . 'config.' . $phpEx);
! 
  		//
  		// Define backend template extension
  		//
! 		$tplEx = 'html';
  
  		//
  		// Validate db connection for backend
  		//
! 		$_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" );
! 		$portal_backend_valid_db = $db->sql_numrows( $_result ) != 0;
  
  		return $portal_backend_valid_file && !empty($table_prefix) && $portal_backend_valid_db;
--- 196,214 ----
  		// Load phpbb config.php (to get table prefix)
  		//
! 		if ((include $phpbb_root_path . "config.$phpEx") === false)
! 		{
! 			die('Configuration file (config) ' . $phpbb_root_path . "/config.$phpEx" . ' couldn\'t be opened.');
! 		}
! 		
  		//
  		// Define backend template extension
  		//
! 		$tplEx = 'html';		
  
  		//
  		// Validate db connection for backend
  		//
! 		$_result = $db->sql_query("SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'");
! 		$portal_backend_valid_db = $db->sql_numrows($_result) != 0;
  
  		return $portal_backend_valid_file && !empty($table_prefix) && $portal_backend_valid_db;
***************
*** 222,226 ****
  	{
  		global $portal_config, $board_config, $phpbb_root_path, $phpEx;
! 
  		$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
  		$server_name = trim($portal_config['server_name']);
--- 225,229 ----
  	{
  		global $portal_config, $board_config, $phpbb_root_path, $phpEx;
! 		
  		$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
  		$server_name = trim($portal_config['server_name']);
***************
*** 705,709 ****
  	function obtain_phpbb_config($use_cache = true)
  	{
! 		global $db, $mx_cache;
  
  		if (($config = $mx_cache->get('phpbb_config')) && ($use_cache) )
--- 708,712 ----
  	function obtain_phpbb_config($use_cache = true)
  	{
! 		global $db, $phpbb_root_path, $table_prefix, $mx_cache, $phpEx;
  
  		if (($config = $mx_cache->get('phpbb_config')) && ($use_cache) )
***************
*** 712,721 ****
  		}
  		else
! 		{
  			if (!defined('CONFIG_TABLE'))
  			{
! 				global $table_prefix, $mx_root_path, $phpEx;
! 
! 				include($mx_root_path . 'includes/sessions/phpbb3/constants.' . $phpEx);
  			}
  
--- 715,724 ----
  		}
  		else
! 		{		
  			if (!defined('CONFIG_TABLE'))
  			{
! 				global $table_prefix, $mx_root_path;
! 				
! 				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
  			}