X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Finstall-inc.php;h=0f4244cbf64d80d830f5327c294d6bd23d1e415d;hb=54064b2236537ac1d673c36686c0c4fda1cf4a3a;hp=4bbca9b7791fda18897333b1bcefe69047f4a5cb;hpb=d495bd859975d08ee459d03c9b1cd51dd9b9304d;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 4bbca9b779..0f4244cbf6 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -1,7 +1,7 @@
');
- setRequestGetElement('page', 3);
+ addToInstallContent('
{--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('{--INSTALL_SMTP_PASSWORD1_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('{--INSTALL_SMTP_PASSWORD2_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('{--INSTALL_SMTP_PASS_MISMATCH--}
');
+ setGetRequestElement('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')) {
@@ -88,29 +96,30 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
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!)
- 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('');
+ case '2': // Database login data
+ 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'] = 'mailer';
+ 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(' ');
- }
- $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'];
+ addToInstallContent(' {--FATAL_NO--}' . ($key + 1) . ': ' . $err . ' ');
+ } // END - foreach
+ addToInstallContent(' ');
+ } // 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'] = postRequestElement('spath');
$content['burl'] = postRequestElement('burl');
$content['title'] = postRequestElement('title');
@@ -121,7 +130,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
addTemplateToInstallContent('install_page2', $content);
break;
- case 3:
+ case '3':
// Set more values
$content['spath'] = postRequestElement('spath');
$content['burl'] = postRequestElement('burl');
@@ -130,10 +139,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$content['email'] = postRequestElement('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 (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
@@ -143,14 +152,14 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$smtpPass2 = postRequestElement('smtp_pass');
} // 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'];
+ // Database login data
+ $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;
@@ -162,7 +171,7 @@ 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');
@@ -175,10 +184,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$content['smtp_user'] = postRequestElement('smtp_user');
$content['smtp_pass'] = postRequestElement('smtp_pass1');
- // MySQL data
+ // Database login data
$OUT = '';
- foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
+ $OUT .= ' ';
} // END - foreach
$content['mysql_hidden'] = $OUT;
@@ -191,18 +200,29 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// You have submitted data then we have to reset the SQLs
initSqls();
- // Connect to MySQL server
- SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+ /*
+ * Restore PHPs error handler to prevent ours to handle errors,
+ * e.g. failed connection attempts. We want to handle them on
+ * our own.
+ */
+ restore_error_handler();
+
+ // Connect to database server
+ 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(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
- // Installation area not found!
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+ // Installation area not found
+ debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
+ return;
} // END - if
- if (getTotalFatalErrors() == '0') {
+ // Any errors detected?
+ if (!ifFatalErrorsDetected()) {
// Set type and prefix from POST data
setConfigEntry('_TABLE_TYPE' , postRequestElement('mysql', 'type'));
setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
@@ -215,24 +235,21 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// 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');
} 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(''.print_r(getSqls(), true).' ');
+ //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:''.print_r(getSqls(), true).' ');
// 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
@@ -245,15 +262,15 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
} // END - if
} // END - if
- if (getTotalFatalErrors() > 0) {
+ if (ifFatalErrorsDetected()) {
$OUT = '';
foreach (getFatalArray() as $value) {
- $OUT .= " " . $value . " \n";
+ $OUT .= ' ' . $value . ' ';
} // END foreach
$content['fatal_errors'] = $OUT;
$OUT = '';
- foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
+ $OUT .= ' ';
} // END foreach
$content['mysql_hidden'] = $OUT;
$content['spath'] = postRequestElement('spath');
@@ -265,13 +282,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// Load template
addTemplateToInstallContent('install_fatal_errors', $content);
+
+ // We have handled all fatal errors here
+ initFatalMessages();
} else {
// Installation is done!
redirectToUrl('install.php?page=finished');
}
} else {
// Something goes wrong during installation! :-(
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
}
break;
@@ -287,12 +307,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
default:
logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
- addTemplateToInstallContent('admin_settings_saved', "{--WRONG_PAGE--}
");
+ addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
break;
} // END - switch
} else {
// Already installed!
- addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+ addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
}
// [EOF]