[mxbb-commits] core/install/includes functions_install.php, 1.10, 1.11

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

Update of /cvsroot/mxbb/core/install/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9848/install/includes

Modified Files:
	functions_install.php 
Log Message:
some bugs fixed and mysql_41 schema upgraded

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functions_install.php	25 Jun 2008 23:54:46 -0000	1.10
--- functions_install.php	19 Aug 2008 02:46:23 -0000	1.11
***************
*** 842,846 ****
  function get_phpbb_info($config)
  {
! 	@include($config);
  	return array(
  		'dbms'			=> $dbms,
--- 842,851 ----
  function get_phpbb_info($config)
  {
! 
! 	if ((@include $config) === false)
! 	{
! 		install_die(GENERAL_ERROR, 'Configuration file ' . $config . ' couldn\'t be opened.');
! 	}
! 
  	return array(
  		'dbms'			=> $dbms,
***************
*** 860,874 ****
  function get_phpbb_url($table_prefix)
  {
! 	global $db;
  
! 	$sql = "SELECT * FROM ".$table_prefix."config";
  	if( !($result = $db->sql_query($sql)) )
  	{
  		return false;
  	}
! 	while( $row = $db->sql_fetchrow($result) )
  	{
  		$board_config[$row['config_name']] = $row['config_value'];
  	}
  	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
  	$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
--- 865,882 ----
  function get_phpbb_url($table_prefix)
  {
! 	global $mx_root_path, $phpEx, $db;
  
! 	$sql = 'SELECT *
! 		FROM ' . $table_prefix . 'config';
  	if( !($result = $db->sql_query($sql)) )
  	{
  		return false;
  	}
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$board_config[$row['config_name']] = $row['config_value'];
  	}
+ 	$db->sql_freeresult($result);
+ 	
  	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
  	$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
***************
*** 901,906 ****
  
  	require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
! 
  	return $db->db_connect_id;
  }
  
--- 909,915 ----
  
  	require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
! 	
  	return $db->db_connect_id;
+ 	
  }