More rewrites of constants and fix for loading mass-included scripts by GET_DIR_AS_AR...

[mailer.git] / install.php

diff --git a/install.php b/install.php
index 213a6485eaf7401f7435ad2389d25e90ee8cc821..238ae1317fd54bd870b7559b3c587048647b93c5 100644 (file)
--- a/install.php
+++ b/install.php
@@ -42,18 +42,17 @@
  ************************************************************************/
 
 // 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");
 
 // Init "action" and "what"
-global $what, $action;
 $GLOBALS['what']   = "";
 $GLOBALS['action'] = "";
 
 // Set CSS variable for "normal mode"
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
 
 // Set module
 $GLOBALS['module'] = "install";
@@ -65,14 +64,14 @@ require("inc/config.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'))) {
+if ((isInstalled()) && (isAdminRegistered())) {
        // Add fatal message
-       addFatalMessage(ALREADY_INSTALLED);
+       addFatalMessage(getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?