makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

#16695

Browse source 
#s17235


git-svn-id: file:///svn/phpbb/trunk@8290 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-12-27 17:34:05 +00:00
parent 5eb46fb67e
commit fe56349e34
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/install/install_convert.php
View file

@ -422,8 +422,7 @@ class install_convert extends module
} }
else else
{ {
$src_dbpasswd = htmlspecialchars_decode($src_dbpasswd); $connect_test = connect_check_db(true, $error, $available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, true, ($src_dbms == $dbms) ? false : true, false);
$connect_test = connect_check_db(true, $error, $available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, $src_dbpasswd, $src_dbname, $src_dbport, true, ($src_dbms == $dbms) ? false : true, false);
} }
// The forum prefix of the old and the new forum can only be the same if two different databases are used. // The forum prefix of the old and the new forum can only be the same if two different databases are used.
@ -443,7 +442,7 @@ class install_convert extends module
{ {
$sql_db = 'dbal_' . $src_dbms; $sql_db = 'dbal_' . $src_dbms;
$src_db = new $sql_db(); $src_db = new $sql_db();
$src_db->sql_connect($src_dbhost, $src_dbuser, $src_dbpasswd, $src_dbname, $src_dbport, false, true); $src_db->sql_connect($src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, false, true);
$same_db = false; $same_db = false;
} }
else else
@ -666,7 +665,7 @@ class install_convert extends module
} }
$sql_db = 'dbal_' . $convert->src_dbms; $sql_db = 'dbal_' . $convert->src_dbms;
$src_db = new $sql_db(); $src_db = new $sql_db();
$src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, $convert->src_dbpasswd, $convert->src_dbname, $convert->src_dbport, false, true); $src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, htmlspecialchars_decode($convert->src_dbpasswd), $convert->src_dbname, $convert->src_dbport, false, true);
$same_db = false; $same_db = false;
} }
else else

39
phpBB/install/install_install.php
View file

@ -551,7 +551,7 @@ class install_install extends module
} }
else else
{ {
$connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], $data['dbpasswd'], $data['dbname'], $data['dbport']); $connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport']);
} }
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(
@ -884,17 +884,26 @@ class install_install extends module
// Time to convert the data provided into a config file // Time to convert the data provided into a config file
$config_data = "<?php\n"; $config_data = "<?php\n";
$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n"; $config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
$config_data .= "\$dbms = '" . $available_dbms[$data['dbms']]['DRIVER'] . "';\n";
$config_data .= "\$dbhost = '{$data['dbhost']}';\n"; $config_data_array = array(
$config_data .= "\$dbport = '{$data['dbport']}';\n"; 'dbms' => $available_dbms[$data['dbms']]['DRIVER'],
$config_data .= "\$dbname = '{$data['dbname']}';\n"; 'dbhost' => $data['dbhost'],
$config_data .= "\$dbuser = '{$data['dbuser']}';\n"; 'dbport' => $data['dbport'],
$config_data .= "\$dbpasswd = '{$data['dbpasswd']}';\n\n"; 'dbname' => $data['dbname'],
$config_data .= "\$table_prefix = '{$data['table_prefix']}';\n"; 'dbuser' => $data['dbuser'],
// $config_data .= "\$acm_type = '" . (($acm_type) ? $acm_type : 'file') . "';\n"; 'dbpasswd' => htmlspecialchars_decode($data['dbpasswd']),
$config_data .= "\$acm_type = 'file';\n"; 'table_prefix' => $data['table_prefix'],
$config_data .= "\$load_extensions = '$load_extensions';\n\n"; 'acm_type' => 'file',
$config_data .= "@define('PHPBB_INSTALLED', true);\n"; 'load_extensions' => $load_extensions,
);
foreach ($config_data_array as $key => $value)
{
$config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n";
}
unset($config_data_array);
$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
$config_data .= "// @define('DEBUG', true);\n"; $config_data .= "// @define('DEBUG', true);\n";
$config_data .= "// @define('DEBUG_EXTRA', true);\n"; $config_data .= "// @define('DEBUG_EXTRA', true);\n";
$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
@ -1124,7 +1133,7 @@ class install_install extends module
// Instantiate the database // Instantiate the database
$db = new $sql_db(); $db = new $sql_db();
$db->sql_connect($data['dbhost'], $data['dbuser'], $data['dbpasswd'], $data['dbname'], $data['dbport'], false, false); $db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false);
// NOTE: trigger_error does not work here. // NOTE: trigger_error does not work here.
$db->sql_return_on_error(true); $db->sql_return_on_error(true);
@ -1408,7 +1417,7 @@ class install_install extends module
// Instantiate the database // Instantiate the database
$db = new $sql_db(); $db = new $sql_db();
$db->sql_connect($data['dbhost'], $data['dbuser'], $data['dbpasswd'], $data['dbname'], $data['dbport'], false, false); $db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false);
// NOTE: trigger_error does not work here. // NOTE: trigger_error does not work here.
$db->sql_return_on_error(true); $db->sql_return_on_error(true);
@ -1948,7 +1957,7 @@ class install_install extends module
'dbhost' => request_var('dbhost', ''), 'dbhost' => request_var('dbhost', ''),
'dbport' => request_var('dbport', ''), 'dbport' => request_var('dbport', ''),
'dbuser' => request_var('dbuser', ''), 'dbuser' => request_var('dbuser', ''),
'dbpasswd' => htmlspecialchars_decode(request_var('dbpasswd', '', true)), 'dbpasswd' => request_var('dbpasswd', '', true),
'dbname' => request_var('dbname', ''), 'dbname' => request_var('dbname', ''),
'table_prefix' => request_var('table_prefix', ''), 'table_prefix' => request_var('table_prefix', ''),
'default_lang' => basename(request_var('default_lang', '')), 'default_lang' => basename(request_var('default_lang', '')),