X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=install.php;h=22e48ef1b1417cd0909ab8f113e3672f92c5a305;hb=6c79a2ab7254e656340ee4504e652662babae7c1;hp=b1ad8f173626a96ce458bd4f54763af8368065a2;hpb=0437f06b273f885db05736449a952c6eb72086ca;p=mailer.git

diff --git a/install.php b/install.php
index b1ad8f1736..22e48ef1b1 100644
--- a/install.php
+++ b/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,18 +46,20 @@
  * 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;
+$GLOBALS['output_mode'] = '0';
 
 // Set module
 $GLOBALS['module'] = 'install';
@@ -65,37 +67,40 @@ $GLOBALS['module'] = 'install';
 // Load config file
 require('inc/config-global.php');
 
+// Set content type
+setContentType('text/html');
+
+// Reload page to page=welcome when it is not specified
+if (!isGetRequestElementSet('page')) {
+	redirectToUrl('install.php?page=welcome');
+} // END - if
+
+// Set username
+setUsername('{--USERNAME_INSTALLER--}');
+
 // Already installed?
-if (isInstalled()) {
+if ((isInstalled()) && (getRequestElement('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
+// Load header here
+loadIncludeOnce('inc/header.php');
 
-	// Load header here
-	loadIncludeOnce('inc/header.php');
+// Handle fatal errors
+runFilterChain('handle_fatal_errors');
 
-	// 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');
+// 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
-	loadIncludeOnce('inc/footer.php');
-} else {
-	// Output fatal messages
-	loadInclude('inc/fatal_errors.php');
-}
+// Footer
+loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>