More fixes on cache to reduce queries
[mailer.git] / index.php
index 9f7f464..1af40fc 100644 (file)
--- a/index.php
+++ b/index.php
@@ -38,8 +38,6 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module
 $GLOBALS['module'] = "index";
@@ -48,50 +46,46 @@ $GLOBALS['module'] = "index";
 require ("inc/config.php");
 
 // Is the script installed?
-if (defined('mxchange_installed') && (mxchange_installed))
-{
+if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Header
        require(PATH."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;
+
        // Check for cookies
-       if (empty($_COOKIE['visited']) || ($CONFIG['index_delay'] == 0) || ($CONFIG['index_cookie'] == 0))
-       {
-               if ($CONFIG['index_cookie'] > 0)
-               {
+       if ((isSessionVariableSet('visited')) || ($_CONFIG['index_delay'] == 0) || ($_CONFIG['index_cookie'] == 0)) {
+               // Is the index page configured for redirect pr not?
+               if ($_CONFIG['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 ($_CONFIG['index_delay'] > 0) {
                        // This will be a JavaScript-redirect!
-                       define('__DELAY_VALUE', ($CONFIG['index_delay'] * 1000 + 500));
+                       define('__DELAY_VALUE', ($_CONFIG['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...
 ?>