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

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 312719aa9317d0ee3d0ccb217c6b5e11a5becbc0..6a03eee6224f913c5338d196c1da3b91b32c2442 100644 (file)
--- a/index.php
+++ b/index.php
@@ -33,26 +33,29 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("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 module
 $GLOBALS['module'] = "index";
 
+// Set "CSS-Mode"
+$GLOBALS['output_mode'] = "0";
+
 // Load config.php
 require("inc/config.php");
 
 // Is the script installed?
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
        // Header
-       require(PATH."inc/header.php");
+       LOAD_INC("inc/header.php");
 
        // Fix missing array elements here
-       if (getConfig('index_delay') == null)  $_CONFIG['index_delay']  = 0;
-       if (getConfig('index_cookie') == null) $_CONFIG['index_cookie'] = 0;
+       if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
+       if (!isConfigEntrySet('index_cookie')) setConfigEntry('index_cookie', 0);
 
        // Check for cookies
        if ((isSessionVariableSet('visited')) || (getConfig('index_delay') == 0) || (getConfig('index_cookie') == 0)) {
@@ -81,9 +84,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Footer
-       require(PATH."inc/footer.php");
+       LOAD_INC("inc/footer.php");
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }