[mxbb-commits] core/install/includes functions_install.php, 1.2.2.2, 1.2.2.3

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

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

Modified Files:
      Tag: core28x
	functions_install.php 
Log Message:
Minor updates to installation

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** functions_install.php	3 Feb 2008 19:23:28 -0000	1.2.2.2
--- functions_install.php	10 Feb 2008 21:11:28 -0000	1.2.2.3
***************
*** 75,88 ****
  	global $lang;
  	$available_dbms = array(
! 		'firebird'	=> array(
! 			'LABEL'			=> 'FireBird',
! 			'SCHEMA'		=> 'firebird',
! 			'MODULE'		=> 'interbase',
! 			'DELIM'			=> ';;',
! 			'COMMENTS'		=> 'remove_remarks',
! 			'DRIVER'		=> 'firebird',
! 			'AVAILABLE'		=> true,
! 			'2.0.x'			=> false,
! 		),
  		'mysqli'	=> array(
  			'LABEL'			=> 'MySQL with MySQLi Extension',
--- 75,88 ----
  	global $lang;
  	$available_dbms = array(
! //		'firebird'	=> array(
! //			'LABEL'			=> 'FireBird',
! //			'SCHEMA'		=> 'firebird',
! //			'MODULE'		=> 'interbase',
! //			'DELIM'			=> ';;',
! //			'COMMENTS'		=> 'remove_remarks',
! //			'DRIVER'		=> 'firebird',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> false,
! //		),
  		'mysqli'	=> array(
  			'LABEL'			=> 'MySQL with MySQLi Extension',
***************
*** 105,138 ****
  			'2.0.x'			=> true,
  		),
! 		'mssql'		=> array(
! 			'LABEL'			=> 'MS SQL Server 2000+',
! 			'SCHEMA'		=> 'mssql',
! 			'MODULE'		=> 'mssql',
! 			'DELIM'			=> 'GO',
! 			'COMMENTS'		=> 'remove_comments',
! 			'DRIVER'		=> 'mssql',
! 			'AVAILABLE'		=> true,
! 			'2.0.x'			=> true,
! 		),
! 		'mssql_odbc'=>	array(
! 			'LABEL'			=> 'MS SQL Server [ ODBC ]',
! 			'SCHEMA'		=> 'mssql',
! 			'MODULE'		=> 'odbc',
! 			'DELIM'			=> 'GO',
! 			'COMMENTS'		=> 'remove_comments',
! 			'DRIVER'		=> 'mssql_odbc',
  			'AVAILABLE'		=> true,
  			'2.0.x'			=> true,
  		),
! 		'oracle'	=>	array(
! 			'LABEL'			=> 'Oracle',
! 			'SCHEMA'		=> 'oracle',
! 			'MODULE'		=> 'oci8',
! 			'DELIM'			=> '/',
! 			'COMMENTS'		=> 'remove_comments',
! 			'DRIVER'		=> 'oracle',
! 			'AVAILABLE'		=> true,
! 			'2.0.x'			=> false,
! 		),
  		'postgres' => array(
  			'LABEL'			=> 'PostgreSQL 7.x/8.x',
--- 105,148 ----
  			'2.0.x'			=> true,
  		),
! 		'mysql4' => array(
! 			'LABEL'			=> 'MySQL 4.x',
! 			'SCHEMA'		=> 'mysql',
! 			'MODULE'		=> 'mysql',
! 			'DELIM'			=> ';',
! 			'COMMENTS'		=> 'remove_remarks',
! 			'DRIVER'		=> 'mysql',
  			'AVAILABLE'		=> true,
  			'2.0.x'			=> true,
  		),
! //		'mssql'		=> array(
! //			'LABEL'			=> 'MS SQL Server 2000+',
! //			'SCHEMA'		=> 'mssql',
! //			'MODULE'		=> 'mssql',
! //			'DELIM'			=> 'GO',
! //			'COMMENTS'		=> 'remove_comments',
! //			'DRIVER'		=> 'mssql',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> true,
! //		),
! //		'mssql_odbc'=>	array(
! //			'LABEL'			=> 'MS SQL Server [ ODBC ]',
! //			'SCHEMA'		=> 'mssql',
! //			'MODULE'		=> 'odbc',
! //			'DELIM'			=> 'GO',
! //			'COMMENTS'		=> 'remove_comments',
! //			'DRIVER'		=> 'mssql_odbc',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> true,
! //		),
! //		'oracle'	=>	array(
! //			'LABEL'			=> 'Oracle',
! //			'SCHEMA'		=> 'oracle',
! //			'MODULE'		=> 'oci8',
! //			'DELIM'			=> '/',
! //			'COMMENTS'		=> 'remove_comments',
! //			'DRIVER'		=> 'oracle',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> false,
! //		),
  		'postgres' => array(
  			'LABEL'			=> 'PostgreSQL 7.x/8.x',
***************
*** 145,158 ****
  			'2.0.x'			=> true,
  		),
! 		'sqlite'		=> array(
! 			'LABEL'			=> 'SQLite',
! 			'SCHEMA'		=> 'sqlite',
! 			'MODULE'		=> 'sqlite',
! 			'DELIM'			=> ';',
! 			'COMMENTS'		=> 'remove_remarks',
! 			'DRIVER'		=> 'sqlite',
! 			'AVAILABLE'		=> true,
! 			'2.0.x'			=> false,
! 		),
  	);
  
--- 155,168 ----
  			'2.0.x'			=> true,
  		),
! //		'sqlite'		=> array(
! //			'LABEL'			=> 'SQLite',
! //			'SCHEMA'		=> 'sqlite',
! //			'MODULE'		=> 'sqlite',
! //			'DELIM'			=> ';',
! //			'COMMENTS'		=> 'remove_remarks',
! //			'DRIVER'		=> 'sqlite',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> false,
! //		),
  	);
  
***************
*** 224,228 ****
  	{
  		$selected = ($dbms_name == $default) ? ' selected="selected"' : '';
! 		$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>';
  	}
  	return $dbms_options;
--- 234,239 ----
  	{
  		$selected = ($dbms_name == $default) ? ' selected="selected"' : '';
! 		//$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>';
! 		$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $dbms_name . '</option>';
  	}
  	return $dbms_options;
***************
*** 877,880 ****
--- 888,893 ----
  	global $mx_root_path, $phpEx;
  
+ 	unset($GLOBALS['SQL_LAYER']);
+ 
  	if( !defined('BEGIN_TRANSACTION') )
  	{
***************
*** 883,905 ****
  	}
  
! 	switch ( $phpbb_info['dbms'] )
! 	{
! 		case 'mysql':
! 			include($mx_root_path . "install/db/mysql.$phpEx");
! 			break;
! 		case 'mysql4':
! 			include($mx_root_path . "install/db/mysql4.$phpEx");
! 			break;
! 		case 'mysqli':
! 			include($mx_root_path . "install/db/mysqli.$phpEx");
! 			break;
! 		case 'postgres':
! 			include($mx_root_path . "install/db/postgres7.$phpEx");
! 			break;
! 		default:
! 			return false;
! 	}
  
! 	$db = new sql_db($phpbb_info['dbhost'], $phpbb_info['dbuser'], $phpbb_info['dbpasswd'], $phpbb_info['dbname'], false);
  
  	return $db->db_connect_id;
--- 896,906 ----
  	}
  
! 	$dbhost = $phpbb_info['dbhost'];
! 	$dbuser = $phpbb_info['dbuser'];
! 	$dbpasswd = $phpbb_info['dbpasswd'];
! 	$dbname = $phpbb_info['dbname'];
  
! 	$dbms = $phpbb_info['dbms'];
! 	include($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class
  
  	return $db->db_connect_id;
***************
*** 1253,1263 ****
  			'portal_version'	=> "'$mx_portal_version'",
  			'portal_phpbb_url'	=> "'$phpbb_url'",
! 			'portal_url'		=> "'$portal_url'",
! 			'overall_header'	=> "'overall_header.$tplEx'",
! 			'main_layout'		=> "'mx_main_layout.$tplEx'",
! 			'navigation_block'	=> 0,
! 			'top_phpbb_links'	=> 0,
! 			'mx_use_cache'		=> 1,
! 			'mod_rewrite'		=> 0,
  		);
  		$sql = "INSERT INTO ".PORTAL_TABLE." (".
--- 1254,1258 ----
  			'portal_version'	=> "'$mx_portal_version'",
  			'portal_phpbb_url'	=> "'$phpbb_url'",
! 			'portal_url'		=> "'$portal_url'"
  		);
  		$sql = "INSERT INTO ".PORTAL_TABLE." (".