Fixes for broken installation routine

[mailer.git] / install.php

diff --git a/install.php b/install.php
index b1ad8f173626a96ce458bd4f54763af8368065a2..75638936e493b07f504ba0211c230a9ee6957e33 100644 (file)
--- a/install.php
+++ b/install.php
@@ -65,37 +65,37 @@ $GLOBALS['module'] = 'install';
 // Load config file
 require('inc/config-global.php');
 
+// Reload page to page=welcome when it is not specified
+if (!REQUEST_ISSET_GET('page')) {
+       redirectToUrl('install.php?page=welcome');
+} // END - if
+
 // Already installed?
-if (isInstalled()) {
+if ((isInstalled()) && (REQUEST_GET('page' != 'finished'))) {
        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?
-if (getTotalFatalErrors() == 0) {
-       // Reload page to page=welcome when it is not specified
-       if (!REQUEST_ISSET_GET('page')) {
-               redirectToUrl('install.php?page=welcome');
-       } // END - if
+if (getTotalFatalErrors() > 0) {
+       // Output fatal messages
+       loadInclude('inc/fatal_errors.php');
+} // END - if
 
-       // Load header here
-       loadIncludeOnce('inc/header.php');
+// Load header here
+loadIncludeOnce('inc/header.php');
 
-       // Add main installation table
-       LOAD_TEMPLATE('install_header');
+// 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
-       loadIncludeOnce('inc/footer.php');
-} else {
-       // Output fatal messages
-       loadInclude('inc/fatal_errors.php');
-}
+// Footer
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>