X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=3d0ca7914143bcf3a7828e2eafa2b5c65be750b5;hb=45cbfe683190c9241e28c3d10168986c46c4a486;hp=7007c9e96123fd544dc61289cb47948b92487675;hpb=06d179ae45f3f049003e6fe213249842b2a630fe;p=mailer.git

diff --git a/install.php b/install.php
index 7007c9e961..3d0ca79141 100644
--- a/install.php
+++ b/install.php
@@ -6,19 +6,9 @@
  * -------------------------------------------------------------------- *
  * 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::                                                            $ *
@@ -28,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -56,7 +47,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 +62,7 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Reload page to page=welcome when it is not specified
-if (!isGetRequestElementSet('page')) {
+if (!isGetRequestParameterSet('page')) {
 	redirectToUrl('install.php?page=welcome');
 } // END - if
 
@@ -79,9 +70,9 @@ if (!isGetRequestElementSet('page')) {
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?
-if ((isInstalled()) && (getRequestElement('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
 	// Add fatal message
-	addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
 
 // Load header here
@@ -93,9 +84,6 @@ 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']);