X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=b1ad8f173626a96ce458bd4f54763af8368065a2;hb=2a6653c65501db2d3128df2ddfae4b0f20bff8a3;hp=a700f22dab2d17f1202c36405d92c6c43482a112;hpb=49ffe0a4fb551d0965e97db1ad4ff12f13f4b9ad;p=mailer.git

diff --git a/install.php b/install.php
index a700f22dab..b1ad8f1736 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,54 +46,56 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Tell every module / include file we are installing
-define('mxchange_installing', true);
-
 // Load security system
-require("inc/libs/security_functions.php");
+require('inc/libs/security_functions.php');
+
+// Tell every module / include file we are installing
+$GLOBALS['mxchange_installing'] = true;
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what']   = "";
-$GLOBALS['action'] = "";
+$GLOBALS['what']   = '';
+$GLOBALS['action'] = '';
 
 // Set CSS variable for "normal mode"
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
 
 // Set module
-$GLOBALS['module'] = "install";
+$GLOBALS['module'] = 'install';
 
 // Load config file
-require("inc/config.php");
-
-// Header
-require(PATH."inc/header.php");
-
-// Reload page to page=welcome when it is not specified
-if (!isset($_GET['page'])) {
-	LOAD_URL("install.php?page=welcome");
-} // END - if
+require('inc/config-global.php');
 
 // Already installed?
-if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
+if (isInstalled()) {
 	// Add fatal message
-	addFatalMessage(ALREADY_INSTALLED);
+	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');
+
 	// Add main installation table
-	LOAD_TEMPLATE("install_header");
+	LOAD_TEMPLATE('install_header');
 
 	// Here start's our installtion stuff
-	require_once(PATH."inc/install-inc.php");
+	loadIncludeOnce('inc/install-inc.php');
 
 	// Close main installation table
-	LOAD_TEMPLATE("install_footer");
-}
+	LOAD_TEMPLATE('install_footer');
 
-// Footer
-require(PATH."inc/footer.php");
+	// Footer
+	loadIncludeOnce('inc/footer.php');
+} else {
+	// Output fatal messages
+	loadInclude('inc/fatal_errors.php');
+}
 
 //
 ?>