if (empty($mysql['login'])) $mysql['login'] = "your_login";
if (empty($mysql['host'])) $mysql['host'] = "localhost";
if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
+ if (empty($mysql['type'])) $mysql['type'] = "MyISAM";
if (getTotalFatalErrors() > 0) {
OUTPUT_HTML("<span class=\"install_fatal\">");
foreach (getFatalArray() as $key => $err) {
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
define('__MYSQL_PREFIX', $mysql['prefix']);
+ define('__TABLE_TYPE' , $mysql['type']);
define('__MYSQL_LOGIN' , $mysql['login']);
define('__SPATH_VALUE' , REQUEST_POST('spath'));
define('__BURL_VALUE' , REQUEST_POST('burl'));
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
define('__MYSQL_PREFIX' , $mysql['prefix']);
+ define('__TABLE_TYPE' , $mysql['type']);
define('__MYSQL_LOGIN' , $mysql['login']);
define('__MYSQL_PASS1' , $mysql['pass1']);
define('__MYSQL_PASS2' , $mysql['pass2']);
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
define('__MYSQL_PREFIX' , $mysql['prefix']);
+ define('__TABLE_TYPE' , $mysql['type']);
define('__MYSQL_LOGIN' , $mysql['login']);
// SMTP settings
<tr>
<td colspan=\"2\" align=\"center\">");
foreach ($mysql as $key => $value) {
- OUTPUT_HTML(" <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+ OUTPUT_HTML(" <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\" />");
}
- OUTPUT_HTML(" <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\">
+ OUTPUT_HTML(" <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\" />
<input type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
<input type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
<input type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
case "finalize": // Write captured data to files
if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
- // You have submitted data then we have to reset the fatal messages
+ // You have submitted data then we have to reset the SQLs
INIT_SQLS();
// Connect to MySQL server
// Automatically run install.sql
if ((FILE_READABLE(REQUEST_POST('spath')."install/tables.sql")) && (FILE_READABLE(REQUEST_POST('spath')."install/menu-".GET_LANGUAGE().".sql"))) {
// Both exists so import them
- foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
+ foreach (array("tables", "menu-".GET_LANGUAGE()) as $dump) {
// Should be save here because file_exists() is there but we check it again. :)
- $FQFN = secureString(REQUEST_POST('spath')) . "install/" . $dump;
+ $FQFN = REQUEST_POST('spath') . "install/" . $dump . ".sql";
if (FILE_READABLE($FQFN)) {
// Read the file
$fileContent = READ_FILE($FQFN, true);
+ // Replace the {!prefix!} with actual one
+ while (strpos($fileContent, "{!prefix!}") !== false) {
+ $fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent);
+ } // END - while
+
+ // Replace the {!type!} with actual one
+ while (strpos($fileContent, "{!type!}") !== false) {
+ $fileContent = str_replace("{!type!}", $mysql['type'], $fileContent);
+ } // END - while
+
// And split it up against ;\n ...
SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent)));
} else {
} // END - if
// Now run all queries through and try to keep out empty or comment queries
- RUN_FILTER('run_sqls', array('dry_run' => false));
+ runFilterChain('run_sqls');
// Ok, all done. So we can write the config data to the php files
if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-LOGIN", " 'login' => \"", "\",", $mysql['login'], 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+ changeDataInFile(REQUEST_POST('spath')."inc/config.php", "TABLE-TYPE", "define('_TABLE_TYPE', \"", "\");", $mysql['type'], 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", REQUEST_POST('smtp_host'), 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", REQUEST_POST('smtp_user'), 0);
changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", REQUEST_POST('smtp_pass1'), 0);