X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=install.php;h=1f3ff34eadb1ed18e1497d8ceb4d8dd8b4f1171e;hp=9e28d9c2aab4ddc765940dada10044a2e5f79460;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hpb=2ec9007220186d54f84846871ed1f7638c29baf7

diff --git a/install.php b/install.php
index 9e28d9c2aa..1f3ff34ead 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,6 +46,9 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // Load security system
 require('inc/libs/security_functions.php');
 
@@ -64,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 (!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
+runFilterChain('handle_fatal_errors');
 
 // Here start's our installtion stuff
 loadIncludeOnce('inc/install-inc.php');
 
-// Close main installation table
-LOAD_TEMPLATE('install_footer');
+// Handle fatal errors again
+runFilterChain('handle_fatal_errors');
+
+// Load main installation table
+loadTemplate('install_main', false, $GLOBALS['install_content']);
 
 // Footer
 loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>