From e526dfe83e805e8ffac5abcab0ba2fc67c7563ce Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 17 Feb 2007 01:14:28 +0000
Subject: - only give DBAL options which were available in phpBB2 - default to
 phpBB3 DB config

git-svn-id: file:///svn/phpbb/trunk@6996 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/convertors/convert_phpbb20.php | 15 +++++++++------
 phpBB/install/install_convert.php            |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 4f66d3848a..8ba43f4be8 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -22,6 +22,9 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+include($phpbb_root_path . 'config.' . $phpEx);
+unset($dbpasswd);
+
 /**
 * $convertor_data provides some basic information about this convertor which is
 * used on the initial list of convertors and to populate the default settings
@@ -31,12 +34,12 @@ $convertor_data = array(
 	'version'		=> '0.9',
 	'phpbb_version'	=> '3.0.0',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
-	'dbms'			=> 'mysql',
-	'dbhost'		=> 'localhost',
-	'dbport'		=> '',
-	'dbuser'		=> 'user',
-	'dbpasswd'		=> 'password',
-	'dbname'		=> '',
+	'dbms'			=> $dbms,
+	'dbhost'		=> $dbhost,
+	'dbport'		=> $dbport,
+	'dbuser'		=> $dbuser,
+	'dbpasswd'		=> '',
+	'dbname'		=> $dbname,
 	'table_prefix'	=> 'phpbb_',
 	'forum_path'	=> '../forums',
 	'author_notes'	=> 'Avatars may be on a different width/height than with the old forum. This is due to dimensions being stored within phpBB3 but not within phpBB2. The default dimension was set to 80x80 for avatars where dimension settings could not be determined. You might wish to instruct your users to check their profiles after the conversion to ensure that the size is correct.',
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index a3541f6f29..862964fccd 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -397,7 +397,7 @@ class install_convert extends module
 			}
 
 			$connect_test = false;
-			$available_dbms = get_available_dbms(false, true);
+			$available_dbms = get_available_dbms(false, true, true);
 
 			if (!isset($available_dbms[$src_dbms]) || !$available_dbms[$src_dbms]['AVAILABLE'])
 			{
@@ -2110,7 +2110,7 @@ class install_convert extends module
 	*/
 	var $convert_options = array(
 		'legend1'			=> 'SPECIFY_OPTIONS',
-		'src_dbms'			=> array('lang' => 'DBMS',			'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\')', 'explain' => false),
+		'src_dbms'			=> array('lang' => 'DBMS',			'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\', true)', 'explain' => false),
 		'src_dbhost'		=> array('lang' => 'DB_HOST',		'type' => 'text:25:100', 'explain' => true),
 		'src_dbport'		=> array('lang' => 'DB_PORT',		'type' => 'text:25:100', 'explain' => true),
 		'src_dbname'		=> array('lang' => 'DB_NAME',		'type' => 'text:25:100', 'explain' => false),
-- 
cgit v1.2.1