Fix for registration, logic went wrong...

[mailer.git] / install.php

diff --git a/install.php b/install.php
index 788f7bfa026a2f11065b1b0d47b399c01b4e5198..89b588949de2e872353dfdafadf44f92d70a0f23 100644 (file)
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 04/26/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 04/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : install.php                                      *
@@ -18,7 +18,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Installationsscript. Bitte loeschen Sie diese    *
  *           Datei nach der fertiggestellten Installation oder JEDER    *
- *           kann Ihr Mailtausch-Script neu einstellen!!!               *
+ *           kann Ihr Mailtausch-Script eventuell neu einstellen.       *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -27,7 +27,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * 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 *
@@ -46,53 +46,61 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // Load security system
 require('inc/libs/security_functions.php');
 
-// Tell every module / include file we are installing
-$GLOBALS['mxchange_installing'] = true;
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
-// Init "action" and "what"
-$GLOBALS['what']   = '';
-$GLOBALS['action'] = '';
+// Tell every module / require file we are installing
+$GLOBALS['mxchange_installing'] = true;
 
 // Set CSS variable for "normal mode"
-$GLOBALS['output_mode'] = 0;
+$GLOBALS['output_mode'] = '0';
 
 // Set module
 $GLOBALS['module'] = 'install';
 
 // Load config file
-require('inc/config.php');
+require('inc/config-global.php');
 
-// Header
-loadInclude('inc/header.php');
+// Set content type
+setContentType('text/html');
 
 // Reload page to page=welcome when it is not specified
-if (!REQUEST_ISSET_GET('page')) {
+if (!isGetRequestParameterSet('page')) {
        redirectToUrl('install.php?page=welcome');
 } // END - if
 
+// Set username
+setUsername('{--USERNAME_INSTALLER--}');
+
 // Already installed?
-if ((isInstalled()) && (isAdminRegistered())) {
+if ((isInstalled()) && (getRequestParameter('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');
+// Load header here
+loadIncludeOnce('inc/header.php');
+
+// Handle fatal errors
+runFilterChain('handle_fatal_errors');
+
+// Here start's our installtion stuff
+loadIncludeOnce('inc/install-inc.php');
 
-       // Here start's our installtion stuff
-       loadIncludeOnce('inc/install-inc.php');
+// Handle fatal errors again
+runFilterChain('handle_fatal_errors');
 
-       // Close main installation table
-       LOAD_TEMPLATE('install_footer');
-}
+// Load main installation table
+loadTemplate('install_main', false, $GLOBALS['install_content']);
 
 // Footer
-loadInclude('inc/footer.php');
+loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>