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 8cab9a1ce16915349606996ecd227006aa5da2d1..238ae1317fd54bd870b7559b3c587048647b93c5 100644 (file)
--- a/install.php
+++ b/install.php
@@ -42,13 +42,12 @@
  ************************************************************************/
 
 // 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'] = "";
 
@@ -65,12 +64,12 @@ 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(getMessage('ALREADY_INSTALLED'));
 } // END - if