X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall%2Finstall_page_finalize.php;h=6cd0f3032f783e8ed68ad636b3e26781a704a4e7;hb=df4166450ac4788f58931bd5d30c617432a63f9d;hp=5c1e09ee112cd43e7d01fe6997f597cad3dd5edc;hpb=fc58173ad036517148d2f17ad6e21cd756bb14e5;p=mailer.git

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index 5c1e09ee11..6cd0f3032f 100644
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -45,12 +45,8 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 	// 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__);
@@ -58,7 +54,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 	// 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
@@ -73,24 +69,14 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 				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) {
@@ -101,9 +87,6 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 
 				// Now run all queries through
 				runFilterChain('run_sqls');
-
-				// Copy the config template and verify it
-				doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
 			} // END - if
 		} // END - if
 	} // END - if
@@ -123,6 +106,8 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 		$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');
@@ -133,6 +118,27 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 		// 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!