Fixes for broken installation routine

[mailer.git] / install.php

diff --git a/install.php b/install.php
index 0253d0e1d423a73aa2d8c1b59e4ee8f8deaaa8ec..75638936e493b07f504ba0211c230a9ee6957e33 100644 (file)
--- a/install.php
+++ b/install.php
@@ -63,36 +63,39 @@ $GLOBALS['output_mode'] = 0;
 $GLOBALS['module'] = 'install';
 
 // Load config file
-require('inc/config.php');
-
-// Header
-LOAD_INC('inc/header.php');
+require('inc/config-global.php');
 
 // Reload page to page=welcome when it is not specified
 if (!REQUEST_ISSET_GET('page')) {
-       LOAD_URL('install.php?page=welcome');
+       redirectToUrl('install.php?page=welcome');
 } // END - if
 
 // Already installed?
-if ((isInstalled()) && (isAdminRegistered())) {
+if ((isInstalled()) && (REQUEST_GET('page' != 'finished'))) {
        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?
-if (getTotalFatalErrors() == 0) {
-       // Add main installation table
-       LOAD_TEMPLATE('install_header');
+if (getTotalFatalErrors() > 0) {
+       // Output fatal messages
+       loadInclude('inc/fatal_errors.php');
+} // END - if
+
+// Load header here
+loadIncludeOnce('inc/header.php');
+
+// Add main installation table
+LOAD_TEMPLATE('install_header');
 
-       // Here start's our installtion stuff
-       LOAD_INC_ONCE('inc/install-inc.php');
+// Here start's our installtion stuff
+loadIncludeOnce('inc/install-inc.php');
 
-       // Close main installation table
-       LOAD_TEMPLATE('install_footer');
-}
+// Close main installation table
+LOAD_TEMPLATE('install_footer');
 
 // Footer
-LOAD_INC('inc/footer.php');
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>