X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=0b8928b27ce1bfc126c2da8a6c11284b2f161d04;hp=c45dc021bd2bcb9c67a6c271cd8389e319d8dc21;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa
diff --git a/inc/install-inc.php b/inc/install-inc.php
index c45dc021bd..0b8928b27c 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -47,10 +47,10 @@ if (!defined('__SECURITY')) {
} // END - if
// Init variables
-$mysql = array();
+$GLOBALS['install_mysql'] = array();
if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
// Transfer 'mysql' array
- $mysql = postRequestParameter('mysql');
+ $GLOBALS['install_mysql'] = postRequestParameter('mysql');
} // END - if
// Check if both passwords from SMTP are matching
@@ -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('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_HOSTNAME_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
// Password is empty
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS1_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
// Password repeat is empty
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS2_EMPTY--}
');
setGetRequestParameter('page', 3);
} // END - if
if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
+ addToInstallContent('
{--INSTALL_SMTP_PASS_MISMATCH--}
');
setGetRequestParameter('page', 3);
} // END - if
} // END - if
@@ -95,23 +95,23 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
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) {
+ if (empty($GLOBALS['install_mysql']['dbase'])) $GLOBALS['install_mysql']['dbase'] = 'your_database';
+ if (empty($GLOBALS['install_mysql']['login'])) $GLOBALS['install_mysql']['login'] = 'your_login';
+ if (empty($GLOBALS['install_mysql']['host'])) $GLOBALS['install_mysql']['host'] = 'localhost';
+ if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
+ if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM';
+ if (ifFatalErrorsDetected()) {
addToInstallContent('
');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
- }
+ addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
+ } // END - foreach
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'];
+ } // END - if
+ $content['mysql_host'] = $GLOBALS['install_mysql']['host'];
+ $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
+ $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+ $content['mysql_login'] = $GLOBALS['install_mysql']['login'];
+ $content['table_type'] = $GLOBALS['install_mysql']['type'];
$content['spath'] = postRequestParameter('spath');
$content['burl'] = postRequestParameter('burl');
$content['title'] = postRequestParameter('title');
@@ -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');
@@ -145,13 +145,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
} // END - if
// MySQL settings
- $content['mysql_host'] = $mysql['host'];
- $content['mysql_dbase'] = $mysql['dbase'];
- $content['mysql_prefix'] = $mysql['prefix'];
- $content['table_type'] = $mysql['type'];
- $content['mysql_login'] = $mysql['login'];
- $content['mysql_pass1'] = $mysql['pass1'];
- $content['mysql_pass2'] = $mysql['pass2'];
+ $content['mysql_host'] = $GLOBALS['install_mysql']['host'];
+ $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
+ $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+ $content['table_type'] = $GLOBALS['install_mysql']['type'];
+ $content['mysql_login'] = $GLOBALS['install_mysql']['login'];
+ $content['mysql_pass1'] = $GLOBALS['install_mysql']['pass1'];
+ $content['mysql_pass2'] = $GLOBALS['install_mysql']['pass2'];
// Set constants for SMTP data
$content['smtp_host'] = $smtpHost;
@@ -178,8 +178,8 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// MySQL data
$OUT = '';
- foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
+ $OUT .= ' ';
} // END - foreach
$content['mysql_hidden'] = $OUT;
@@ -193,17 +193,21 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
initSqls();
// Connect to MySQL server
- SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+ SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+
+ // Is the link up?
if (SQL_IS_LINK_UP()) {
// Seems to work, also right database?
- if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
- // Automatically run install.sql
+ if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+ // 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
- if (getTotalFatalErrors() == '0') {
+ // Any errors detected?
+ if (!ifFatalErrorsDetected()) {
// Set type and prefix from POST data
setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type'));
setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
@@ -222,15 +226,15 @@ 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('
');
// Are some SQLs found?
- if (countSqls() == '0') {
+ if (countSqls() == 0) {
// Abort here
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
return;
} // END - if
@@ -243,14 +247,14 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
} // END - if
} // END - if
- if (getTotalFatalErrors() > 0) {
+ if (ifFatalErrorsDetected()) {
$OUT = '';
foreach (getFatalArray() as $value) {
$OUT .= '