[mxbb-commits] core/install/includes functions_install.php, 1.2, 1.3

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

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

Modified Files:
	functions_install.php 
Log Message:
Ok, massive update for 2.9.x.

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions_install.php	11 Aug 2007 03:49:32 -0000	1.2
--- functions_install.php	9 Sep 2007 16:49:07 -0000	1.3
***************
*** 75,98 ****
  	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',
! 			'SCHEMA'		=> 'mysql_41',
! 			'MODULE'		=> 'mysqli',
! 			'DELIM'			=> ';',
! 			'COMMENTS'		=> 'remove_remarks',
! 			'DRIVER'		=> 'mysqli',
! 			'AVAILABLE'		=> true,
! 			'2.0.x'			=> true,
! 		),
  		'mysql'		=> array(
  			'LABEL'			=> 'MySQL',
--- 75,98 ----
  	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',
! //			'SCHEMA'		=> 'mysql_41',
! //			'MODULE'		=> 'mysqli',
! //			'DELIM'			=> ';',
! //			'COMMENTS'		=> 'remove_remarks',
! //			'DRIVER'		=> 'mysqli',
! //			'AVAILABLE'		=> true,
! //			'2.0.x'			=> true,
! //		),
  		'mysql'		=> array(
  			'LABEL'			=> 'MySQL',
***************
*** 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,238 ----
  	{
  		$selected = ($dbms_name == $default) ? ' selected="selected"' : '';
! 		$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $dbms_name . '</option>';
  	}
  	return $dbms_options;
***************
*** 1246,1278 ****
  	global $mx_portal_name, $mx_portal_version, $phpbb_url, $portal_url, $tplEx;
  
! 	if( $mode == 'install' )
! 	{
! 		$portal_table = array(
! 			'portal_id'		=> 1,
! 			'portal_name'		=> "'$mx_portal_name'",
! 			'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." (".
! 			implode(', ', array_keys($portal_table)).
! 			") VALUES (".
! 			implode(', ', array_values($portal_table)).
! 			")";
! 	}
! 	else
! 	{
! 		$sql = "UPDATE ".PORTAL_TABLE."
! 			SET portal_name='$mx_portal_name',
! 			portal_version='$mx_portal_version'
! 			WHERE portal_id = 1";
! 	}
! 	parse_cmd_sql($sql);
  }
  
--- 1256,1260 ----
  	global $mx_portal_name, $mx_portal_version, $phpbb_url, $portal_url, $tplEx;
  
! 
  }