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 4a7366a5de40eb059e738c7533dba3148814f936..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";
@@ -62,33 +61,33 @@ $GLOBALS['module'] = "install";
 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'))) {
+if ((isInstalled()) && (isAdminRegistered())) {
        // Add fatal message
-       addFatalMessage(ALREADY_INSTALLED);
+       addFatalMessage(getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?
-if (getTotalFatalMessages() == 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");
 
 //
 ?>