// You have submitted data then we have to reset the SQLs
initSqls();
- /*
- * Restore PHPs error handler to prevent ours to handle errors,
- * e.g. failed connection attempts. We want to handle them on
- * our own.
- */
- restore_error_handler();
+ // Remove any existing "cache"
+ unset($GLOBALS['is_sql_link_up']);
// Connect to database server
SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
// Is the link up?
if (SQL_IS_LINK_UP()) {
// Seems to work, also right database?
- if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+ if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
// Check for dumps
if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
// Installation area not found
setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
setConfigEntry('__DB_NAME' , $GLOBALS['install_mysql']['dbase']);
- // Both exists so import them
- foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
- // Should be save here because file_exists() is there but we check it again. :)
- $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
-
- // Is the file readable?
- if (isFileReadable($FQFN)) {
- // Read the file
- $fileContent = readSqlDump($FQFN);
+ // Set path
+ setConfigEntry('PATH', postRequestElement('spath'));
+ unset($GLOBALS['getPath']);
- // Split it up against ";\n" and merge it into existing SQLs
- mergeSqls(explode(";\n", $fileContent), 'install');
- } else {
- // Not readable!
- reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
- }
- } // END - foreach
- //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
+ // Both exists so import them
+ importInstallSqlDump('tables');
+ importInstallSqlDump('menu-' . getLanguage());
+ //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), TRUE).'</pre>');
// Are some SQLs found?
if (countSqls() == 0) {
// Now run all queries through
runFilterChain('run_sqls');
-
- // Copy the config template and verify it
- doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
} // END - if
} // END - if
} // END - if
$content['spath'] = postRequestElement('spath');
$content['burl'] = postRequestElement('burl');
$content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
$content['smtp_host'] = postRequestElement('smtp_host');
$content['smtp_user'] = postRequestElement('smtp_user');
$content['smtp_pass'] = postRequestElement('smtp_pass1');
// We have handled all fatal errors here
initFatalMessages();
} else {
+ // Copy the config template and verify it
+ doInstallWriteLocalConfigurationFile(
+ postRequestElement('spath'),
+ postRequestElement('burl'),
+ postRequestElement('title'),
+ postRequestElement('slogan'),
+ postRequestElement('email'),
+ postRequestElement('warn_no_pass'),
+ postRequestElement('wfooter'),
+ postRequestElement('blink'),
+ postRequestElement('mysql', 'host'),
+ postRequestElement('mysql', 'dbase'),
+ postRequestElement('mysql', 'login'),
+ postRequestElement('mysql', 'pass1'),
+ postRequestElement('mysql', 'prefix'),
+ postRequestElement('mysql', 'type'),
+ postRequestElement('smtp_host'),
+ postRequestElement('smtp_user'),
+ postRequestElement('smtp_pass1')
+ );
+
// Register ext-sql_patches and ext-task
if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
// Installation is done!