X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=install.php;h=9e28d9c2aab4ddc765940dada10044a2e5f79460;hp=238ae1317fd54bd870b7559b3c587048647b93c5;hb=a7c7b8307405aa270a38ce4e363c41b3d1c9c745;hpb=f74581eca45c393033acfd9d7798b958031bc625

diff --git a/install.php b/install.php
index 238ae1317f..9e28d9c2aa 100644
--- a/install.php
+++ b/install.php
@@ -20,7 +20,12 @@
  *           Datei nach der fertiggestellten Installation oder JEDER    *
  *           kann Ihr Mailtausch-Script neu einstellen!!!               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -41,53 +46,55 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Tell every module / include file we are installing
-$GLOBALS['mxchange_installing'] = true;
-
 // Load security system
-require("inc/libs/security_functions.php");
+require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what']   = "";
-$GLOBALS['action'] = "";
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
+
+// Tell every module / include file we are installing
+$GLOBALS['mxchange_installing'] = true;
 
 // Set CSS variable for "normal mode"
 $GLOBALS['output_mode'] = 0;
 
 // Set module
-$GLOBALS['module'] = "install";
+$GLOBALS['module'] = 'install';
 
 // Load config file
-require("inc/config.php");
-
-// Header
-LOAD_INC("inc/header.php");
+require('inc/config-global.php');
 
 // Reload page to page=welcome when it is not specified
 if (!REQUEST_ISSET_GET('page')) {
-	LOAD_URL("install.php?page=welcome");
+	redirectToUrl('install.php?page=welcome');
 } // END - if
 
 // Already installed?
-if ((isInstalled()) && (isAdminRegistered())) {
+if ((isInstalled()) && (REQUEST_GET('page' != 'finished'))) {
 	// Add fatal message
-	addFatalMessage(getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?
-if (getTotalFatalErrors() == 0) {
-	// Add main installation table
-	LOAD_TEMPLATE("install_header");
+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');
 
-	// Here start's our installtion stuff
-	LOAD_INC_ONCE("inc/install-inc.php");
+// Here start's our installtion stuff
+loadIncludeOnce('inc/install-inc.php');
 
-	// Close main installation table
-	LOAD_TEMPLATE("install_footer");
-}
+// Close main installation table
+LOAD_TEMPLATE('install_footer');
 
 // Footer
-LOAD_INC("inc/footer.php");
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>