X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=fa17cf66ce4e2c5cee8276512338fb45d1be0983;hp=4bbca9b7791fda18897333b1bcefe69047f4a5cb;hb=325bb973c136c921d0c36384ca9655aa7744283e;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 4bbca9b779..fa17cf66ce 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -1,7 +1,7 @@
');
- setRequestGetElement('page', 3);
+ addToInstallContent('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ setGetRequestParameter('page', 3);
} // END - if
- if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
+ if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
// Password is empty
- addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . ' ');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ setGetRequestParameter('page', 3);
} // END - if
- if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
+ if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
// Password repeat is empty
- addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . ' ');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ setGetRequestParameter('page', 3);
} // END - if
- if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
+ if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . ' ');
- setRequestGetElement('page', 3);
+ addToInstallContent('' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
+ setGetRequestParameter('page', 3);
} // END - if
} // END - if
-// Is MXChange installed or no admin registered so far?
+// Is the mailer installed or no admin registered so far?
if ((!isInstalled()) || (!isAdminRegistered())) {
// Output page for entered value
- switch (getRequestElement('page')) {
+ switch (getRequestParameter('page')) {
case 'welcome': // Welcome to the installation!
addTemplateToInstallContent('install_welcome');
break;
- case 1: // Server path, base URL
+ case '1': // Server path, base URL
// Load template
addTemplateToInstallContent('install_page1');
break;
- case 2: // MySQL data (alone!)
+ case '2': // MySQL data (alone!)
if (empty($mysql['dbase'])) $mysql['dbase'] = 'your_database';
if (empty($mysql['login'])) $mysql['login'] = 'your_login';
if (empty($mysql['host'])) $mysql['host'] = 'localhost';
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'];
$content['mysql_prefix'] = $mysql['prefix'];
$content['mysql_login'] = $mysql['login'];
$content['table_type'] = $mysql['type'];
- $content['spath'] = postRequestElement('spath');
- $content['burl'] = postRequestElement('burl');
- $content['title'] = postRequestElement('title');
- $content['slogan'] = postRequestElement('slogan');
- $content['email'] = postRequestElement('email');
+ $content['spath'] = postRequestParameter('spath');
+ $content['burl'] = postRequestParameter('burl');
+ $content['title'] = postRequestParameter('title');
+ $content['slogan'] = postRequestParameter('slogan');
+ $content['email'] = postRequestParameter('email');
// Load template
addTemplateToInstallContent('install_page2', $content);
break;
- case 3:
+ case '3':
// Set more values
- $content['spath'] = postRequestElement('spath');
- $content['burl'] = postRequestElement('burl');
- $content['title'] = postRequestElement('title');
- $content['slogan'] = postRequestElement('slogan');
- $content['email'] = postRequestElement('email');
+ $content['spath'] = postRequestParameter('spath');
+ $content['burl'] = postRequestParameter('burl');
+ $content['title'] = postRequestParameter('title');
+ $content['slogan'] = postRequestParameter('slogan');
+ $content['email'] = postRequestParameter('email');
// Use default SMTP data
$smtpHost = getConfig('SMTP_HOSTNAME');
@@ -136,11 +136,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$smtpPass2 = getConfig('SMTP_PASSWORD');
// Overwrite it with the data from sent (failed) form
- if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
- if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
- if (isPostRequestElementSet('smtp_pass')) {
- $smtpPass1 = postRequestElement('smtp_pass');
- $smtpPass2 = postRequestElement('smtp_pass');
+ if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
+ if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user');
+ if (isPostRequestParameterSet('smtp_pass')) {
+ $smtpPass1 = postRequestParameter('smtp_pass');
+ $smtpPass2 = postRequestParameter('smtp_pass');
} // END - if
// MySQL settings
@@ -162,18 +162,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
addTemplateToInstallContent('install_page3', $content);
break;
- case 5: // Misc settings
+ case '5': // Misc settings
// General settings
- $content['spath'] = postRequestElement('spath');
- $content['burl'] = postRequestElement('burl');
- $content['title'] = postRequestElement('title');
- $content['slogan'] = postRequestElement('slogan');
- $content['email'] = postRequestElement('email');
+ $content['spath'] = postRequestParameter('spath');
+ $content['burl'] = postRequestParameter('burl');
+ $content['title'] = postRequestParameter('title');
+ $content['slogan'] = postRequestParameter('slogan');
+ $content['email'] = postRequestParameter('email');
// SMTP settings
- $content['smtp_host'] = postRequestElement('smtp_host');
- $content['smtp_user'] = postRequestElement('smtp_user');
- $content['smtp_pass'] = postRequestElement('smtp_pass1');
+ $content['smtp_host'] = postRequestParameter('smtp_host');
+ $content['smtp_user'] = postRequestParameter('smtp_user');
+ $content['smtp_pass'] = postRequestParameter('smtp_pass1');
// MySQL data
$OUT = '';
@@ -187,7 +187,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
case 'finalize': // Write captured data to files
- if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
+ if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
// You have submitted data then we have to reset the SQLs
initSqls();
@@ -197,28 +197,25 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// Seems to work, also right database?
if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
// Automatically run install.sql
- if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+ 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'));
} // END - if
if (getTotalFatalErrors() == '0') {
// Set type and prefix from POST data
- setConfigEntry('_TABLE_TYPE' , postRequestElement('mysql', 'type'));
- setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
+ setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type'));
+ setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
// 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';
+ $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
// Is the file readable?
if (isFileReadable($FQFN)) {
// Read the file
- $fileContent = readFromFile($FQFN, true);
-
- // Compile all config entries (we use a filter here, yes...)
- $fileContent = FILTER_COMPILE_CONFIG($fileContent);
+ $fileContent = readSqlDump($FQFN);
// Split it up against ";\n" and merge it into existing SQLs
mergeSqls(explode(";\n", $fileContent), 'install');
@@ -248,20 +245,20 @@ 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');
- $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['spath'] = postRequestParameter('spath');
+ $content['burl'] = postRequestParameter('burl');
+ $content['title'] = postRequestParameter('title');
+ $content['smtp_host'] = postRequestParameter('smtp_host');
+ $content['smtp_user'] = postRequestParameter('smtp_user');
+ $content['smtp_pass'] = postRequestParameter('smtp_pass1');
// Load template
addTemplateToInstallContent('install_fatal_errors', $content);
@@ -286,8 +283,8 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
default:
- logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
- addTemplateToInstallContent('admin_settings_saved', "{--WRONG_PAGE--}
");
+ logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
+ addTemplateToInstallContent('admin_settings_saved', '{--WRONG_PAGE--}
');
break;
} // END - switch
} else {