Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / install.php

diff --git a/install.php b/install.php
index 3e394cc273f208739f3c670c590ec3651ee22c28..6be0243cbcc56e1a1c36ca0b2cc10f9cf7b23621 100644 (file)
--- a/install.php
+++ b/install.php
@@ -15,14 +15,10 @@
  * Short description : Installation script. Please delete this file     *
  *           after successfully installation or ANYONE can re-setup     *
  *           your mail exchange script!!!                               *
- *                                                                      *
- *           First of all setup the base URL.                           *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Installationsscript. Bitte loeschen Sie diese    *
  *           Datei nach der fertiggestellten Installation oder JEDER    *
  *           kann Ihr Mailtausch-Script neu einstellen!!!               *
- *                                                                      *
- *           Als erstes sollten Sie die Basis-URL einstellen.           *
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -46,50 +42,52 @@
  ************************************************************************/
 
 // Tell every module / include file we are installing
-define('mxchange_installing', true);
+$GLOBALS['mxchange_installing'] = true;
 
 // Load security system
-require ("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what']   = "";
+$GLOBALS['action'] = "";
+
+// Set CSS variable for "normal mode"
+$GLOBALS['output_mode'] = 0;
 
 // Set module
 $GLOBALS['module'] = "install";
 
 // Load config file
-require ("inc/config.php");
+require("inc/config.php");
 
 // Header
-require (PATH."inc/header.php");
+LOAD_INC("inc/header.php");
 
 // Reload page to page=welcome when it is not specified
-if (!isset($_GET['page']))
-{
+if (!REQUEST_ISSET_GET('page')) {
        LOAD_URL("install.php?page=welcome");
-}
+} // END - if
 
 // Already installed?
 if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
        // Add fatal message
-       ADD_FATAL(ALREADY_INSTALLED);
-}
+       addFatalMessage(getMessage('ALREADY_INSTALLED'));
+} // END - if
 
 // Does something goes wrong?
-if ((sizeof($FATAL == 0)) && (empty($FATAL[0]))) {
+if (getTotalFatalErrors() == 0) {
        // Add main installation table
        LOAD_TEMPLATE("install_header");
 
        // Here start's our installtion stuff
-       require_once (PATH."inc/install-inc.php");
+       LOAD_INC_ONCE("inc/install-inc.php");
 
        // Close main installation table
        LOAD_TEMPLATE("install_footer");
 }
 
 // Footer
-require (PATH."inc/footer.php");
+LOAD_INC("inc/footer.php");
 
 //
 ?>