X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=install.php;h=79e5d2f6d09df37b213d53e398ea6bf85d7511fe;hb=4b0380051488bb228d151a36e059f257e2a50a69;hp=99c1f7659317ab53c5b3a3dfea379747bbc55f9e;hpb=fe1e1d3b8291b1ca991e3d2e639cb28097c53d74;p=mailer.git

diff --git a/install.php b/install.php
index 99c1f76593..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,6 +46,9 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // Load security system
 require('inc/libs/security_functions.php');
 
@@ -64,34 +67,37 @@ $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 (!REQUEST_ISSET_GET('page')) {
+if (!isGetRequestElementSet('page')) {
 	redirectToUrl('install.php?page=welcome');
 } // END - if
 
+// Set username
+setUsername('{--USERNAME_INSTALLER--}');
+
 // Already installed?
-if ((isInstalled()) && (REQUEST_GET('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestElement('page' != 'finished'))) {
 	// Add fatal message
 	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 } // END - if
 
-// Does something goes wrong?
-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');
+// Handle fatal errors
+handleFatalErrors();
 
 // Here start's our installtion stuff
 loadIncludeOnce('inc/install-inc.php');
 
-// Close main installation table
-LOAD_TEMPLATE('install_footer');
+// Handle fatal errors again
+handleFatalErrors();
+
+// Load main installation table
+loadTemplate('install_main', false, $GLOBALS['install_content']);
 
 // Footer
 loadIncludeOnce('inc/footer.php');