X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=09f399cece65b73b5ecdc33b1b8110fdd38780a9;hb=05f2bbfff5c041bc126894e87ea979bd3df6eb25;hp=84d5e0c1076a3170647b5971baafeef3bc1494d2;hpb=d9ea2987f84be54851fb813703513bcb9b1cb940;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 84d5e0c107..09f399cece 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -57,26 +57,26 @@ if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
// Okay, we have to check it
if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
// Hostname not set
- addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
- setRequestGetElement('page', 3);
+ addToInstallContent('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ setGetRequestElement('page', 3);
} // END - if
if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
// Password is empty
- addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ setGetRequestElement('page', 3);
} // END - if
if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
// Password repeat is empty
- addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ setGetRequestElement('page', 3);
} // END - if
if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
+ setGetRequestElement('page', 3);
} // END - if
} // END - if
@@ -100,11 +100,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
if (empty($mysql['type'])) $mysql['type'] = 'MyISAM';
if (getTotalFatalErrors() > 0) {
- addToInstallContent('');
+ addToInstallContent('');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
+ addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
}
- addToInstallContent('
');
+ addToInstallContent('
');
}
$content['mysql_host'] = $mysql['host'];
$content['mysql_dbase'] = $mysql['dbase'];
@@ -217,9 +217,6 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// Read the file
$fileContent = readFromFile($FQFN, true);
- // Compile all config entries (we use a filter here, yes...)
- $fileContent = FILTER_COMPILE_CONFIG($fileContent);
-
// Split it up against ";\n" and merge it into existing SQLs
mergeSqls(explode(";\n", $fileContent), 'install');
} else {
@@ -248,12 +245,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
if (getTotalFatalErrors() > 0) {
$OUT = '';
foreach (getFatalArray() as $value) {
- $OUT .= " " . $value . "\n";
+ $OUT .= ' ' . $value . '';
} // END foreach
$content['fatal_errors'] = $OUT;
$OUT = '';
foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ $OUT .= ' ';
} // END foreach
$content['mysql_hidden'] = $OUT;
$content['spath'] = postRequestElement('spath');
@@ -287,7 +284,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
default:
logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
- addTemplateToInstallContent('admin_settings_saved', "{--WRONG_PAGE--}
");
+ addTemplateToInstallContent('admin_settings_saved', '{--WRONG_PAGE--}
');
break;
} // END - switch
} else {