* 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 *
* 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
// Init variables
$mysql = array();
-if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+ // Transfer 'mysql' array
+ $mysql = postRequestElement('mysql');
+} // END - if
// Check if both passwords from SMTP are matching
-if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
+if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
// Okay, we have to check it
- if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
+ if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
// Hostname not set
- OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '<br />');
+ setRequestGetElement('page', 3);
} // END - if
- if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
// Password is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '<br />');
+ setRequestGetElement('page', 3);
} // END - if
- if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
// Password repeat is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '<br />');
+ setRequestGetElement('page', 3);
} // END - if
- if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
+ if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '<br />');
+ setRequestGetElement('page', 3);
} // END - if
} // END - if
// Is MXChange 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 (getRequestElement('page')) {
case 'welcome': // Welcome to the installation!
- LOAD_TEMPLATE('install_welcome');
+ addTemplateToInstallContent('install_welcome');
break;
- case '1': // Server path, base URL
+ case 1: // Server path, base URL
// Load template
- LOAD_TEMPLATE('install_page1');
+ 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) {
- OUTPUT_HTML("<span class=\"install_fatal\">");
+ addToInstallContent('<span class="install_fatal">');
foreach (getFatalArray() as $key => $err) {
- OUTPUT_HTML(" <strong>·</strong> {--FATAL_NO--}".($key + 1).": ".$err."<br />");
+ addToInstallContent('<strong>·</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '<br />');
}
- OUTPUT_HTML("</span><br />");
+ addToInstallContent('</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'));
+ $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');
// Load template
- LOAD_TEMPLATE('install_page2');
+ addTemplateToInstallContent('install_page2', $content);
break;
- case '3':
+ 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'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// Use default SMTP data
$smtpHost = getConfig('SMTP_HOSTNAME');
$smtpPass2 = getConfig('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 (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
- 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']);
+ $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'];
// 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
+ 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'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// SMTP settings
- define('__SMTP_HOST', REQUEST_POST('smtp_host'));
- define('__SMTP_USER', REQUEST_POST('smtp_user'));
- define('__SMTP_PASS', REQUEST_POST('smtp_pass1'));
- OUTPUT_HTML("<form action=\"{!__BURL_ACTION!}/install.php?page=finalize\" method=\"POST\" target=\"_self\">
-<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_main\">
-<tr>
- <td colspan=\"2\" align=\"center\">
- <div class=\"install\">{--HEADER_TEXT_PAGE5--}</strong>
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\"> </td></tr>
-<tr>
- <td colspan=\"2\"><span class=\"install_text\">
- {--TEXT_PAGE_5--}
- </span></td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\"> </td></tr>
-<tr>
- <td class=\"install\" align=\"right\">{--LANG_OUTPUT_MODE--}: </td>
- <td>
- <select name=\"omode\" size=\"1\" class=\"install_select\">
- <option value=\"render\">{--MODE_RENDER--}</option>
- <option value=\"direct\">{--MODE_DIRECT--}</option>
- </select>
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"10\" class=\"seperator\"> </td></tr>
-<tr>
- <td class=\"install\" align=\"right\">{--WARN_NO_PASSWORD--}: </td>
- <td>
- <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
- <option value=\"Y\">{--YES--}</option>
- <option value=\"N\">{--NO--}</option>
- </select>
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"10\" class=\"seperator\"> </td></tr>
-<tr>
- <td class=\"install\" align=\"right\">{--LANG_WRITE_FOOTER--}: </td>
- <td>
- <select name=\"wfooter\" size=\"1\" class=\"install_select\">
- <option value=\"Y\">{--YES--}</option>
- <option value=\"N\">{--NO--}</option>
- </select>
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"10\" class=\"seperator\"> </td></tr>
-<tr>
- <td class=\"install\" align=\"right\">{--INSTALL_ENABLE_BACKLINK--}: </td>
- <td>
- <select name=\"blink\" size=\"1\" class=\"install_select\">
- <option value=\"Y\">{--YES--}</option>
- <option value=\"N\">{--NO--}</option>
- </select>
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\"> </td></tr>
-<tr>
- <td colspan=\"2\" align=\"center\">");
+ $content['smtp_host'] = postRequestElement('smtp_host');
+ $content['smtp_user'] = postRequestElement('smtp_user');
+ $content['smtp_pass'] = postRequestElement('smtp_pass1');
+
+ // MySQL data
+ $OUT = '';
foreach ($mysql as $key => $value) {
- OUTPUT_HTML(" <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\" />");
- }
- OUTPUT_HTML(" <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\" />
- <input type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
- <input type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
- <input type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
- <input type=\"hidden\" name=\"email\" value=\"{!__EMAIL_VALUE!}\" />
- <input type=\"hidden\" name=\"smtp_host\" value=\"{!__SMTP_HOST!}\" />
- <input type=\"hidden\" name=\"smtp_user\" value=\"{!__SMTP_USER!}\" />
- <input type=\"hidden\" name=\"smtp_pass\" value=\"{!__SMTP_PASS!}\" />
- <input type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"{--NEXT_PAGE--}\" class=\"install_submit\" />
- </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\"> </td></tr>
-</table>
-</form>");
+ $OUT .= " <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+ } // END - foreach
+ $content['mysql_hidden'] = $OUT;
+
+ // Load template
+ addTemplateToInstallContent('install_page5', $content);
break;
case 'finalize': // Write captured data to files
- if ((REQUEST_ISSET_POST('finalize')) && (!isInstalled())) {
+ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
// You have submitted data then we have to reset the SQLs
- INIT_SQLS();
+ initSqls();
// Connect to MySQL server
SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
// 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'))) {
+ 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'));
} // END - if
- if (getTotalFatalErrors() == 0) {
+ if (getTotalFatalErrors() == '0') {
+ // Set type and prefix from POST data
+ 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 = REQUEST_POST('spath') . 'install/' . $dump . '.sql';
+ $FQFN = postRequestElement('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
+ // Compile all config entries (we use a filter here, yes...)
+ $fileContent = FILTER_COMPILE_CONFIG($fileContent);
// 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));
}
} // END - foreach
+ //* DEBUG: */ die('<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'));
return;
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
foreach (getFatalArray() as $value) {
$OUT .= " <li>" . $value . "</li>\n";
} // 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";
} // 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'] = 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
- LOAD_TEMPLATE('install_fatal_errors');
+ addTemplateToInstallContent('install_fatal_errors', $content);
} 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');
}
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", getRequestElement('page')));
+
addTemplateToInstallContent('admin_settings_saved', "<div class=\"install_error\">{--WRONG_PAGE--}</div>");
break;
- }
+ } // END - switch
} else {
// Already installed!
addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
}
-//
+// [EOF]
?>
projects / mailer.git / blobdiff