Several bugfixes/improvements: (again)

[mailer.git] / index.php

diff --git a/index.php b/index.php
index ab4e5b7610a8dcd9d79cf3b833adc7d1da378c61..9b98c0f1d381013fdffdb01abe0869d1131cd38a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -43,53 +43,49 @@ $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");
 
+       // Fix missing array elements here
+       if (getConfig('index_delay') == null)  $_CONFIG['index_delay']  = 0;
+       if (getConfig('index_cookie') == null) $_CONFIG['index_cookie'] = 0;
+
        // Check for cookies
-       if (empty($_COOKIE['visited']) || ($CONFIG['index_delay'] == 0) || ($CONFIG['index_cookie'] == 0))
-       {
-               if ($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 (getConfig('index_cookie') > 0) {
                        // Set cookie and remeber it for specified time
-                       @setcookie("visited", "true", (time() + $CONFIG['index_cookie']), COOKIE_PATH);
-               }
-                elseif (!empty($_COOKIE['visited']))
-               {
+                       set_session("visited", "true");
+               } elseif (isSessionVariableSet('visited')) {
                        // Remove cookie when admin set 0 in setup
-                       @setcookie("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");
                }
-       }
-        else
-       {
+       } else {
                // Redirect to main page
-               LOAD_URL(URL."/modules.php?module=index");
+               LOAD_URL("modules.php?module=index");
        }
 
        // Footer
        require(PATH."inc/footer.php");
-}
- else
-{
+} else {
        // You have to configure first!
        LOAD_URL("install.php");
 }
+
 // All done here...
 ?>