Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / install.php

diff --git a/install.php b/install.php
index 788f7bfa026a2f11065b1b0d47b399c01b4e5198..9e28d9c2aab4ddc765940dada10044a2e5f79460 100644 (file)
--- a/install.php
+++ b/install.php
@@ -49,13 +49,12 @@
 // Load security system
 require('inc/libs/security_functions.php');
 
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
+
 // Tell every module / include file we are installing
 $GLOBALS['mxchange_installing'] = true;
 
-// Init "action" and "what"
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
-
 // Set CSS variable for "normal mode"
 $GLOBALS['output_mode'] = 0;
 
@@ -63,10 +62,7 @@ $GLOBALS['output_mode'] = 0;
 $GLOBALS['module'] = 'install';
 
 // Load config file
-require('inc/config.php');
-
-// Header
-loadInclude('inc/header.php');
+require('inc/config-global.php');
 
 // Reload page to page=welcome when it is not specified
 if (!REQUEST_ISSET_GET('page')) {
@@ -74,25 +70,31 @@ if (!REQUEST_ISSET_GET('page')) {
 } // 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
-       loadIncludeOnce('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
-loadInclude('inc/footer.php');
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>