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

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index 5c1e09ee11..bf8187cd00 100644
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
 	die();
 } // END - if
 
@@ -45,22 +45,18 @@ 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"
+	unsetSqlLinkUp(__FILE__, __LINE__);
 
 	// Connect to database server
-	SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+	sqlConnectToDatabase($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['password1'], __FILE__, __LINE__);
 
 	// Is the link up?
-	if (SQL_IS_LINK_UP()) {
+	if (isSqlLinkUp()) {
 		// Seems to work, also right database?
-		if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+		if (sqlSelectDatabase($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
 			// Check for dumps
-			if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+			if (!isInstallerSqlsReadable(postRequestElement('spath'))) {
 				// Installation area not found
 				reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
 				return;
@@ -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
@@ -119,13 +102,15 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 		foreach ($GLOBALS['install_mysql'] as $key => $value) {
 			$OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
 		} // END foreach
-		$content['mysql_hidden'] = $OUT;
-		$content['spath']      = postRequestElement('spath');
-		$content['burl']       = postRequestElement('burl');
-		$content['title']      = postRequestElement('title');
-		$content['smtp_host']  = postRequestElement('smtp_host');
-		$content['smtp_user']  = postRequestElement('smtp_user');
-		$content['smtp_pass']  = postRequestElement('smtp_pass1');
+		$content['mysql_hidden']  = $OUT;
+		$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_password'] = postRequestElement('smtp_password1');
 
 		// Load template
 		addTemplateToInstallContent('install_fatal_errors', $content);
@@ -133,6 +118,28 @@ 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', 'password1'),
+			postRequestElement('mysql', 'prefix'),
+			postRequestElement('mysql', 'type'),
+			postRequestElement('mysql', 'extension'),
+			postRequestElement('smtp_host'),
+			postRequestElement('smtp_user'),
+			postRequestElement('smtp_password1')
+		);
+
 		// Register ext-sql_patches and ext-task
 		if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
 			// Installation is done!