X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=install.php;h=79e5d2f6d09df37b213d53e398ea6bf85d7511fe;hp=d632be4e43ead547dd2e729d3660306079fab085;hb=2abf1ab70c824b92934910d9f5da3c37fe089c47;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361

diff --git a/install.php b/install.php
index d632be4e43..79e5d2f6d0 100644
--- a/install.php
+++ b/install.php
@@ -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,16 +46,18 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // 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;
 
@@ -65,34 +67,40 @@ $GLOBALS['module'] = 'install';
 // Load config file
 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 (!isGetRequestElementSet('page')) {
 	redirectToUrl('install.php?page=welcome');
 } // END - if
 
+// Set username
+setUsername('{--USERNAME_INSTALLER--}');
+
 // Already installed?
-if ((isInstalled()) && (isAdminRegistered())) {
+if ((isInstalled()) && (getRequestElement('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
+handleFatalErrors();
+
+// 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
+handleFatalErrors();
 
-	// 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]
 ?>