X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=429abb4272f715763fe23f6268cb1a24517dc04b;hb=102403bf54b89ba5ca9a97bb8ba834c94ebe7a07;hp=89b588949de2e872353dfdafadf44f92d70a0f23;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/install.php b/install.php
index 89b588949d..429abb4272 100644
--- a/install.php
+++ b/install.php
@@ -6,29 +6,18 @@
  * -------------------------------------------------------------------- *
  * File              : install.php                                      *
  * -------------------------------------------------------------------- *
- *                                                                      *
- *          ------------------------------------------------            *
- *         / PLEASE READ THIS!  /  BITTE LESEN SIE DIESES! /            *
- *        -------------------------------------------------             *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Short description : Installation script. Please delete this file     *
- *           after successfully installation or ANYONE can re-setup     *
- *           your mail exchange script!!!                               *
+ * Short description : Installation script.                             *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Installationsscript. Bitte loeschen Sie diese    *
- *           Datei nach der fertiggestellten Installation oder JEDER    *
- *           kann Ihr Mailtausch-Script eventuell neu einstellen.       *
+ * Kurzbeschreibung  : Installationsscript.                             *
  * -------------------------------------------------------------------- *
  * $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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -56,7 +45,7 @@ require('inc/libs/security_functions.php');
 $GLOBALS['startTime'] = microtime(true);
 
 // Tell every module / require file we are installing
-$GLOBALS['mxchange_installing'] = true;
+$GLOBALS['mailer_installing'] = true;
 
 // Set CSS variable for "normal mode"
 $GLOBALS['output_mode'] = '0';
@@ -71,7 +60,7 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Reload page to page=welcome when it is not specified
-if (!isGetRequestParameterSet('page')) {
+if (!isGetRequestElementSet('page')) {
 	redirectToUrl('install.php?page=welcome');
 } // END - if
 
@@ -79,9 +68,9 @@ if (!isGetRequestParameterSet('page')) {
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?
-if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestElement('page') != 'finished')) {
 	// Add fatal message
-	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
 
 // Load header here
@@ -93,11 +82,8 @@ runFilterChain('handle_fatal_errors');
 // Here start's our installtion stuff
 loadIncludeOnce('inc/install-inc.php');
 
-// Handle fatal errors again
-runFilterChain('handle_fatal_errors');
-
 // Load main installation table
-loadTemplate('install_main', false, $GLOBALS['install_content']);
+loadTemplate('install_main');
 
 // Footer
 loadIncludeOnce('inc/footer.php');