More misc fixes and rewrites (sorry, lame description)

[mailer.git] / index.php

diff --git a/index.php b/index.php
index ab4e5b7610a8dcd9d79cf3b833adc7d1da378c61..e13c8536ac0a912c6ce8b2efa008e3dc7a012a37 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,7 +11,12 @@
  * Kurzbeschreibung  : Index-Seite. Eine simple Weiterleitung auf die   *
  *           modules.php                                                *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,64 +37,62 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Set module
-$GLOBALS['module'] = "index";
+$GLOBALS['module'] = 'index';
+
+// Set 'CSS-Mode'
+$GLOBALS['output_mode'] = '0';
 
 // Load config.php
-require ("inc/config.php");
+require('inc/config-global.php');
 
 // Is the script installed?
-if (defined('mxchange_installed') && (mxchange_installed))
-{
-       // Header
-       require(PATH."inc/header.php");
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
 
-       // Check for cookies
-       if (empty($_COOKIE['visited']) || ($CONFIG['index_delay'] == 0) || ($CONFIG['index_cookie'] == 0))
-       {
-               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']))
-               {
-                       // Remove cookie when admin set 0 in setup
-                       @setcookie("visited", "", (time() - 3600), COOKIE_PATH);
-               }
+// Header
+loadIncludeOnce('inc/header.php');
 
-               // Template laden
-               LOAD_TEMPLATE("index", false, ADD_URL_DATA(""));
+// Fix missing array elements here
+if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
+if (!isConfigEntrySet('index_cookie')) setConfigEntry('index_cookie', 0);
 
-               // Shall I insert an automated forward?
-               if ($CONFIG['index_delay'] > 0)
-               {
-                       // This will be a JavaScript-redirect!
-                       define('__DELAY_VALUE', ($CONFIG['index_delay'] * 1000 + 500));
-                       define('__MOD_VALUE'  , ADD_URL_DATA("index"));
-                       LOAD_TEMPLATE("index_forward");
-               }
-       }
-        else
-       {
-               // Redirect to main page
-               LOAD_URL(URL."/modules.php?module=index");
+// Check for cookies
+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
+               setSession('visited', 'true');
+       } elseif (isSessionVariableSet('visited')) {
+               // Remove cookie when admin set 0 in setup
+               setSession('visited', '');
        }
 
-       // Footer
-       require(PATH."inc/footer.php");
-}
- else
-{
-       // You have to configure first!
-       LOAD_URL("install.php");
+       // Template laden
+       LOAD_TEMPLATE('index');
+
+       // Shall I insert an automated forward?
+       if (getConfig('index_delay') > 0) {
+               // This will be a JavaScript-redirect!
+               define('__DELAY_VALUE', (getConfig('index_delay') * 1000 + 500));
+               define('__MOD_VALUE'  , 'index');
+               LOAD_TEMPLATE('index_forward');
+       } // END - if
+} else {
+       // Redirect to main page
+       redirectToUrl('modules.php?module=index');
 }
-// All done here...
+
+// Footer
+loadIncludeOnce('inc/footer.php');
+
+// [EOF]
 ?>