<?php
/************************************************************************
- * MXChange v0.2.1 Start: 08/29/2003 *
- * =============== Last change: 11/11/2004 *
+ * Mailer v0.2.1-FINAL Start: 08/29/2003 *
+ * =================== Last change: 11/11/2004 *
* *
* -------------------------------------------------------------------- *
* File : install-inc.php *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * @TODO Rewrite all constants in this include file *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
+ die();
} // END - if
+// Load extension timezone
+loadExtension('timezone', 'test');
+
+// Set config entry
+setConfigEntry('timezone', 'Europe/Berlin');
+
+// And init timezone
+FILTER_INIT_TIMEZONE();
+
// Init variables
-$mysql = array();
-if ((REQUEST_ISSET_POST('mysql')) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
+$GLOBALS['install_mysql'] = array();
+if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
+ // Transfer 'mysql' array
+ $GLOBALS['install_mysql'] = postRequestParameter('mysql');
+} // END - if
// Check if both passwords from SMTP are matching
-if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
+if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
// Okay, we have to check it
- if (REQUEST_ISSET_POST('smtp_user') && (!REQUEST_ISSET_POST('smtp_host'))) {
+ if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
// Hostname not set
- OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '<br />');
- REQUEST_SET_GET('page', 3);
+ addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
+ setGetRequestParameter('page', 3);
} // END - if
- if ((!REQUEST_ISSET_POST('smtp_pass1')) && (REQUEST_ISSET_POST('smtp_pass2'))) {
+ if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
// Password is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '<br />');
- REQUEST_SET_GET('page', 3);
+ addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
+ setGetRequestParameter('page', 3);
} // END - if
- if ((REQUEST_ISSET_POST('smtp_pass1')) && (!REQUEST_ISSET_POST('smtp_pass2'))) {
+ if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
// Password repeat is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '<br />');
- REQUEST_SET_GET('page', 3);
+ addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
+ setGetRequestParameter('page', 3);
} // END - if
- if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
+ if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '<br />');
- REQUEST_SET_GET('page', 3);
+ addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
+ 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())) {
- // Set URL for FORM actions
- define('__BURL_ACTION', constant('URL'));
-
// Output page for entered value
- switch (REQUEST_GET('page')) {
+ switch (getRequestParameter('page')) {
case 'welcome': // Welcome to the installation!
- LOAD_TEMPLATE('install_welcome');
+ addTemplateToInstallContent('install_welcome');
break;
case '1': // Server path, base URL
// Load template
- LOAD_TEMPLATE('install_page1');
+ 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) {
- OUTPUT_HTML('<span class="install_fatal">');
+ 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('<div class="install_fatal"><ul>');
foreach (getFatalArray() as $key => $err) {
- OUTPUT_HTML('<strong>·</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '<br />');
- }
- OUTPUT_HTML('</span><br />');
- }
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX', $mysql['prefix']);
- define('__TABLE_TYPE' , $mysql['type']);
- define('__MYSQL_LOGIN' , $mysql['login']);
- define('__SPATH_VALUE' , REQUEST_POST('spath'));
- define('__BURL_VALUE' , REQUEST_POST('burl'));
- define('__TITLE_VALUE' , REQUEST_POST('title'));
- define('__SLOGAN_VALUE', REQUEST_POST('slogan'));
- define('__EMAIL_VALUE' , REQUEST_POST('email'));
+ addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');
+ } // END - foreach
+ addToInstallContent('</ol></div>');
+ } // 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');
// Load template
- LOAD_TEMPLATE('install_page2');
+ addTemplateToInstallContent('install_page2', $content);
break;
case '3':
// Set more values
- define('__SPATH_VALUE' , REQUEST_POST('spath'));
- define('__BURL_VALUE' , REQUEST_POST('burl'));
- define('__TITLE_VALUE' , REQUEST_POST('title'));
- define('__SLOGAN_VALUE', REQUEST_POST('slogan'));
- define('__EMAIL_VALUE' , REQUEST_POST('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');
- $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 (REQUEST_ISSET_POST('smtp_host')) $smtpHost = REQUEST_POST('smtp_host');
- if (REQUEST_ISSET_POST('smtp_user')) $smtpUser = REQUEST_POST('smtp_user');
- if (REQUEST_ISSET_POST('smtp_pass')) {
- $smtpPass1 = REQUEST_POST('smtp_pass');
- $smtpPass2 = REQUEST_POST('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
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX', $mysql['prefix']);
- define('__TABLE_TYPE' , $mysql['type']);
- define('__MYSQL_LOGIN' , $mysql['login']);
- define('__MYSQL_PASS1' , $mysql['pass1']);
- define('__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
- define('__SMTP_HOST' , $smtpHost);
- define('__SMTP_USER' , $smtpUser);
- define('__SMTP_PASS1', $smtpPass1);
- define('__SMTP_PASS2', $smtpPass2);
+ $content['smtp_host'] = $smtpHost;
+ $content['smtp_user'] = $smtpUser;
+ $content['smtp_pass1'] = $smtpPass1;
+ $content['smtp_pass2'] = $smtpPass2;
// Load template
- LOAD_TEMPLATE('install_page3');
+ addTemplateToInstallContent('install_page3', $content);
break;
case '5': // Misc settings
// General settings
- define('__SPATH_VALUE' , REQUEST_POST('spath'));
- define('__BURL_VALUE' , REQUEST_POST('burl'));
- define('__TITLE_VALUE' , REQUEST_POST('title'));
- define('__SLOGAN_VALUE', REQUEST_POST('slogan'));
- define('__EMAIL_VALUE' , REQUEST_POST('email'));
-
- // MySQL settings
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX', $mysql['prefix']);
- define('__TABLE_TYPE' , $mysql['type']);
- define('__MYSQL_LOGIN' , $mysql['login']);
+ $content['spath'] = postRequestParameter('spath');
+ $content['burl'] = postRequestParameter('burl');
+ $content['title'] = postRequestParameter('title');
+ $content['slogan'] = postRequestParameter('slogan');
+ $content['email'] = postRequestParameter('email');
// SMTP settings
- define('__SMTP_HOST', REQUEST_POST('smtp_host'));
- define('__SMTP_USER', REQUEST_POST('smtp_user'));
- define('__SMTP_PASS', REQUEST_POST('smtp_pass1'));
-
- // MySQL data
- $content = '';
- foreach ($mysql as $key => $value) {
- $content .= " <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
- }
- define('__MYSQL_DATA', $content);
+ $content['smtp_host'] = postRequestParameter('smtp_host');
+ $content['smtp_user'] = postRequestParameter('smtp_user');
+ $content['smtp_pass'] = postRequestParameter('smtp_pass1');
+
+ // Database login data
+ $OUT = '';
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
+ $OUT .= ' <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
+ } // END - foreach
+ $content['mysql_hidden'] = $OUT;
// Load template
- LOAD_TEMPLATE('install_page5');
+ addTemplateToInstallContent('install_page5', $content);
break;
case 'finalize': // Write captured data to files
- if ((REQUEST_ISSET_POST('finalize')) && (!isInstalled())) {
+ if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
// You have submitted data then we have to reset the SQLs
- INIT_SQLS();
+ initSqls();
+
+ // 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 MySQL server
- SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+ // 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 ((!isFileReadable(REQUEST_POST('spath') . 'install/tables.sql')) || (!isFileReadable(REQUEST_POST('spath') . 'install/menu-'.getLanguage().'.sql'))) {
- // Installation area not found!
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+ 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__, '{--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'));
+
// 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 = REQUEST_POST('spath') . 'install/' . $dump . '.sql';
+ $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
// Is the file readable?
if (isFileReadable($FQFN)) {
// Read the file
- $fileContent = readFromFile($FQFN, true);
-
- // Replace the {!prefix/type!} with actual one
- foreach (array('prefix', 'type') as $replace) {
- while (strpos($fileContent, '{!' . $replace . '!}') !== false) {
- $fileContent = str_replace('{!' . $replace . '!}', $mysql[$replace], $fileContent);
- } // END - while
- } // END - foreach
+ $fileContent = readSqlDump($FQFN);
// Split it up against ";\n" and merge it into existing SQLs
- MERGE_SQLS(explode(";\n", $fileContent));
+ 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(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
// Are some SQLs found?
- if (COUNT_SQLS() == 0) {
+ if (countSqls() == 0) {
// Abort here
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
return;
} // END - if
runFilterChain('run_sqls');
// Copy the config template and verify it
- copyFileVerified(REQUEST_POST('spath') . 'inc/config-local.php.dist', REQUEST_POST('spath') . 'inc/cache/config-local.php', 0644);
-
- // Ok, all done. So we can write the config data to the php files
- if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SERVER-PATH', "define('PATH', '", "');", REQUEST_POST('spath'), 0);
- if (REQUEST_POST('burl') != constant('URL')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'HOST-URL', "define('URL', '", "');", REQUEST_POST('burl'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MAIN-TITLE', "define('MAIN_TITLE', '", "');", REQUEST_POST('title'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SLOGAN', "define('SLOGAN', '", "');", REQUEST_POST('slogan'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WEBMASTER', "define('WEBMASTER', '", "');", REQUEST_POST('email'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", REQUEST_POST('warn_no_pass'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", REQUEST_POST('wfooter'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", REQUEST_POST('blink'), 0);
- // DEACTIVATED: changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'OUTPUT-MODE', "define('OUTPUT_MODE', '", "');", REQUEST_POST('omode'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-HOST', " 'host' => '", "',", $mysql['host'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-DBASE', " 'dbase' => '", "',", $mysql['dbase'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-LOGIN', " 'login' => '", "',", $mysql['login'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-PASSWORD', " 'password' => '", "',", $mysql['pass1'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", $mysql['prefix'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", $mysql['type'], 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", REQUEST_POST('smtp_host'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", REQUEST_POST('smtp_user'), 0);
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", REQUEST_POST('smtp_pass1'), 0);
-
- // Generate a long site key
- $siteKey = generatePassword(50);
-
- // And write it
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SITE-KEY', "setConfigEntry('SITE_KEY', '", "');", $siteKey, 0);
-
- // Script is now installed
- changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'INSTALLED', "setConfigEntry('MXCHANGE_INSTALLED', '", "');", 'Y', 0);
+ doInstallWriteLocalConfig();
} // END - if
} // END - if
} // END - if
- if (getTotalFatalErrors() > 0) {
+ if (ifFatalErrorsDetected()) {
$OUT = '';
foreach (getFatalArray() as $value) {
- $OUT .= " <li>" . $value . "</li>\n";
+ $OUT .= ' <li>' . $value . '</li>';
} // END foreach
- define('__FATAL_ERROR_LI', $OUT);
+ $content['fatal_errors'] = $OUT;
$OUT = '';
- foreach ($mysql as $key => $value) {
- $OUT .= " <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+ foreach ($GLOBALS['install_mysql'] as $key => $value) {
+ $OUT .= ' <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
} // END foreach
- define('__MYSQL_DATA' , $OUT);
- define('__SPATH_VALUE' , REQUEST_POST('spath'));
- define('__BURL_VALUE' , REQUEST_POST('burl'));
- define('__TITLE_VALUE' , REQUEST_POST('title'));
- define('__SMTP_HOST' , REQUEST_POST('smtp_host'));
- define('__SMTP_USER' , REQUEST_POST('smtp_user'));
- define('__SMTP_PASS' , REQUEST_POST('smtp_pass1'));
+ $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');
// Load template
- LOAD_TEMPLATE('install_fatal_errors');
+ 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'));
- loadInclude('inc/fatal_errors.php');
+ addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
}
break;
case 'finished':
if (isInstalled()) {
// Load template that we are finished
- LOAD_TEMPLATE('install_finished');
+ addTemplateToInstallContent('install_finished');
} else {
// Not finished
redirectToUrl('install.php');
break;
default:
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", REQUEST_GET('page')));
- OUTPUT_HTML(" <div class=\"install_error\">{--WRONG_PAGE--}</div>");
+ logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('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]
?>
projects / mailer.git / blobdiff