Fix for ticket #86, thx 2 profi-concept :)

[mailer.git] / index.php

diff --git a/index.php b/index.php
index d2ade5d6df1ddaae2b4a56254bc71b3645bd6201..9142d90b424af8d7cca30c3472d5211e43c28302 100644 (file)
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@
  ************************************************************************/
 
 // 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;
@@ -43,35 +43,35 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "index";
 
 // Load config.php
-require ("inc/config.php");
+require("inc/config.php");
 
 // Is the script installed?
-if (defined('mxchange_installed') && (mxchange_installed)) {
+if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Header
-       require(PATH."inc/header.php");
+       LOAD_INC("inc/header.php");
 
        // Fix missing array elements here
-       if (!isset($_CONFIG['index_delay']))            $_CONFIG['index_delay'] = 0;
-       if (!isset($_CONFIG['index_cookie']))   $_CONFIG['index_cookie'] = 0;
+       if (getConfig('index_delay') == null)  $_CONFIG['index_delay']  = 0;
+       if (getConfig('index_cookie') == null) $_CONFIG['index_cookie'] = 0;
 
        // Check for cookies
-       if ((empty($_SESSION['visited'])) || ($_CONFIG['index_delay'] == 0) || ($_CONFIG['index_cookie'] == 0)) {
+       if ((isSessionVariableSet('visited')) || (getConfig('index_delay') == 0) || (getConfig('index_cookie') == 0)) {
                // Is the index page configured for redirect pr not?
-               if ($_CONFIG['index_cookie'] > 0) {
+               if (getConfig('index_cookie') > 0) {
                        // Set cookie and remeber it for specified time
-                       set_session("visited", "true", (time() + $_CONFIG['index_cookie']), COOKIE_PATH);
-               } elseif (!empty($_SESSION['visited'])) {
+                       set_session('visited', "true");
+               } elseif (isSessionVariableSet('visited')) {
                        // Remove cookie when admin set 0 in setup
-                       set_session("visited", "", (time() - 3600), COOKIE_PATH);
+                       set_session('visited', "");
                }
 
                // Template laden
                LOAD_TEMPLATE("index", false, ADD_URL_DATA(""));
 
                // Shall I insert an automated forward?
-               if ($_CONFIG['index_delay'] > 0) {
+               if (getConfig('index_delay') > 0) {
                        // This will be a JavaScript-redirect!
-                       define('__DELAY_VALUE', ($_CONFIG['index_delay'] * 1000 + 500));
+                       define('__DELAY_VALUE', (getConfig('index_delay') * 1000 + 500));
                        define('__MOD_VALUE'  , ADD_URL_DATA("index"));
                        LOAD_TEMPLATE("index_forward");
                }
@@ -81,9 +81,9 @@ if (defined('mxchange_installed') && (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");
 }