');
+ setGetRequestElement('page', 3);
} // END - if
- if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
+ if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- addToInstallContent('
');
+ setGetRequestElement('page', 3);
} // END - if
} // END - if
// Is the mailer installed or no admin registered so far?
if ((!isInstalled()) || (!isAdminRegistered())) {
// Output page for entered value
- switch (getRequestParameter('page')) {
+ switch (getRequestElement('page')) {
case 'welcome': // Welcome to the installation!
addTemplateToInstallContent('install_welcome');
break;
@@ -94,29 +101,30 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
addTemplateToInstallContent('install_page1');
break;
- case '2': // MySQL data (alone!)
+ 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'] = 'mxchange';
+ 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('
');
+ addToInstallContent('
');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
+ addToInstallContent('
{--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
} // END - foreach
- addToInstallContent('
');
+ 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'] = postRequestParameter('spath');
- $content['burl'] = postRequestParameter('burl');
- $content['title'] = postRequestParameter('title');
- $content['slogan'] = postRequestParameter('slogan');
- $content['email'] = postRequestParameter('email');
+ $content['spath'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// Load template
addTemplateToInstallContent('install_page2', $content);
@@ -124,27 +132,27 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
case '3':
// Set more values
- $content['spath'] = postRequestParameter('spath');
- $content['burl'] = postRequestParameter('burl');
- $content['title'] = postRequestParameter('title');
- $content['slogan'] = postRequestParameter('slogan');
- $content['email'] = postRequestParameter('email');
+ $content['spath'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// Use default SMTP data
- $smtpHost = '{?SMTP_HOSTNAME');
+ $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');
- if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user');
- if (isPostRequestParameterSet('smtp_pass')) {
- $smtpPass1 = postRequestParameter('smtp_pass');
- $smtpPass2 = postRequestParameter('smtp_pass');
+ 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');
} // END - if
- // MySQL settings
+ // Database login data
$content['mysql_host'] = $GLOBALS['install_mysql']['host'];
$content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
@@ -165,18 +173,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
case '5': // Misc settings
// General settings
- $content['spath'] = postRequestParameter('spath');
- $content['burl'] = postRequestParameter('burl');
- $content['title'] = postRequestParameter('title');
- $content['slogan'] = postRequestParameter('slogan');
- $content['email'] = postRequestParameter('email');
+ $content['spath'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// SMTP settings
- $content['smtp_host'] = postRequestParameter('smtp_host');
- $content['smtp_user'] = postRequestParameter('smtp_user');
- $content['smtp_pass'] = postRequestParameter('smtp_pass1');
+ $content['smtp_host'] = postRequestElement('smtp_host');
+ $content['smtp_user'] = postRequestElement('smtp_user');
+ $content['smtp_pass'] = postRequestElement('smtp_pass1');
- // MySQL data
+ // Database login data
$OUT = '';
foreach ($GLOBALS['install_mysql'] as $key => $value) {
$OUT .= ' ';
@@ -188,11 +196,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
case 'finalize': // Write captured data to files
- if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
+ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
// You have submitted data then we have to reset the SQLs
initSqls();
- // Connect to MySQL server
+ /*
+ * 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?
@@ -200,22 +215,22 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// Seems to work, also right database?
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'));
+ if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+ // 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
// Any errors detected?
if (!ifFatalErrorsDetected()) {
// Set type and prefix from POST data
- setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type'));
- setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
+ setConfigEntry('_TABLE_TYPE' , postRequestElement('mysql', 'type'));
+ setConfigEntry('_MYSQL_PREFIX', postRequestElement('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 = postRequestParameter('spath') . 'install/' . $dump . '.sql';
+ $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
// Is the file readable?
if (isFileReadable($FQFN)) {
@@ -234,7 +249,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
@@ -258,22 +273,25 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$OUT .= ' ';
} // END foreach
$content['mysql_hidden'] = $OUT;
- $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');
+ $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');
// 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;
@@ -288,13 +306,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
break;
default:
- logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
- addTemplateToInstallContent('admin_settings_saved', '