X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=0b8928b27ce1bfc126c2da8a6c11284b2f161d04;hp=38e4a6be53215fab6f09a696c03df77e77578bf8;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=d9f35786166902b9bc3f402d4f2abeed5ae0528d

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 38e4a6be53..0b8928b27c 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -58,25 +58,25 @@ if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
 	// Okay, we have to check it
 	if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
 		// Hostname not set
-		addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');
+		addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
 		setGetRequestParameter('page', 3);
 	} // END - if
 
 	if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
 		// Password is empty
-		addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');
+		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
 		setGetRequestParameter('page', 3);
 	} // END - if
 
 	if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
 		// Password repeat is empty
-		addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');
+		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
 		setGetRequestParameter('page', 3);
 	} // END - if
 
 	if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
 		// Passwords are not matching
-		addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');
+		addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
 		setGetRequestParameter('page', 3);
 	} // END - if
 } // END - if
@@ -103,7 +103,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			if (ifFatalErrorsDetected()) {
 				addToInstallContent('<div class="install_fatal">');
 				foreach (getFatalArray() as $key => $err) {
-					addToInstallContent('<div class="para"><strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '</div>');
+					addToInstallContent('<div class="para"><strong>&middot;</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</div>');
 				} // END - foreach
 				addToInstallContent('</div>');
 			} // END - if
@@ -131,10 +131,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			$content['email']      = postRequestParameter('email');
 
 			// Use default SMTP data
-			$smtpHost  = getConfig('SMTP_HOSTNAME');
-			$smtpUser  = getConfig('SMTP_USER');
-			$smtpPass1 = getConfig('SMTP_PASSWORD');
-			$smtpPass2 = getConfig('SMTP_PASSWORD');
+			$smtpHost  = '{?SMTP_HOSTNAME?}';
+			$smtpUser  = '{?SMTP_USER?}';
+			$smtpPass1 = '{?SMTP_PASSWORD?}';
+			$smtpPass2 = '{?SMTP_PASSWORD?}';
 
 			// Overwrite it with the data from sent (failed) form
 			if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
@@ -179,7 +179,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 			// MySQL data
 			$OUT = '';
 			foreach ($GLOBALS['install_mysql'] as $key => $value) {
-				$OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+				$OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
 			} // END - foreach
 			$content['mysql_hidden'] = $OUT;
 
@@ -202,7 +202,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 						// Check for dumps
 						if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
 							// Installation area not found!
-							addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+							addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
 							return;
 						} // END - if
 
@@ -226,7 +226,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 									mergeSqls(explode(";\n", $fileContent), 'install');
 								} else {
 									// Not readable!
-									debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
+									debug_report_bug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable!", $dump));
 								}
 							} // END - foreach
 							//* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
@@ -234,7 +234,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 							// Are some SQLs found?
 							if (countSqls() == 0) {
 								// Abort here
-								addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+								addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
 								return;
 							} // END - if
 
@@ -273,7 +273,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 				}
 			} else {
 				// Something goes wrong during installation! :-(
-				addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+				addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
 			}
 			break;
 
@@ -294,7 +294,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 	} // END - switch
 } else {
 	// Already installed!
-	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 }
 
 // [EOF]