X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=e8304bb0c4fe90a78d24af2d9b2aa3712a77296d;hp=d4afebe5dfad810ef936fbf17166a88de827967b;hb=ab82613b0100336c0966a742c986874ec1692672;hpb=06d97fddd5c72e2b1c14ddb855b7eddc53f169a7;ds=sidebyside

diff --git a/inc/install-inc.php b/inc/install-inc.php
index d4afebe5df..e8304bb0c4 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -47,7 +47,10 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 $mysql = array();
-if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) $mysql = postRequestElement('mysql');
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+	// Transfer 'mysql' array
+	$mysql = postRequestElement('mysql');
+} // END - if
 
 // Check if both passwords from SMTP are matching
 if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
@@ -115,7 +118,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['email']        = postRequestElement('email');
 
 			// Load template
-			addTemplateToInstallContent('install_page2', false, $content);
+			addTemplateToInstallContent('install_page2', $content);
 			break;
 
 		case '3':
@@ -156,7 +159,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['smtp_pass2'] = $smtpPass2;
 
 			// Load template
-			addTemplateToInstallContent('install_page3', false, $content);
+			addTemplateToInstallContent('install_page3', $content);
 			break;
 
 		case '5': // Misc settings
@@ -167,13 +170,6 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['slogan'] = postRequestElement('slogan');
 			$content['email']  = postRequestElement('email');
 
-			// MySQL settings
-			$content['mysql_host']   = $mysql['host'];
-			$content['mysql_dbase']  = $mysql['dbase'];
-			$content['mysql_prefix'] = $mysql['prefix'];
-			$content['mysql_login']  = $mysql['login'];
-			$content['table_type']   = $mysql['type'];
-
 			// SMTP settings
 			$content['smtp_host'] = postRequestElement('smtp_host');
 			$content['smtp_user'] = postRequestElement('smtp_user');
@@ -183,11 +179,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$OUT = '';
 			foreach ($mysql as $key => $value) {
 				$OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
-			}
+			} // END - foreach
 			$content['mysql_hidden'] = $OUT;
 
 			// Load template
-			addTemplateToInstallContent('install_page5', false, $content);
+			addTemplateToInstallContent('install_page5', $content);
 			break;
 
 		case 'finalize': // Write captured data to files
@@ -268,7 +264,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 					$content['smtp_pass']  = postRequestElement('smtp_pass1');
 
 					// Load template
-					addTemplateToInstallContent('install_fatal_errors', false, $content);
+					addTemplateToInstallContent('install_fatal_errors', $content);
 				} else {
 					// Installation is done!
 					redirectToUrl('install.php?page=finished');