Possible final fixes for user login, debug lines rewritten to logfile, some old lost...

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 80da5beba5f4784b0a8ee04a6c0b4e798fc9f813..908248463154aad6ef397e0d143bf3827379afbb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 11/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 11/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : index.php                                        *
@@ -18,7 +18,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,66 +37,61 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
+// Init start time
+$GLOBALS['startTime'] = microtime(true);
 
 // Set module
 $GLOBALS['module'] = 'index';
 
-// Set 'CSS-Mode'
+// Set CSS mode
 $GLOBALS['output_mode'] = '0';
 
 // Load config.php
-require('inc/config.php');
+require('inc/config-global.php');
 
-// Is the script installed?
-if (isInstalled()) {
+// Set content type
+setContentType('text/html');
+
+// Fix missing array elements here
+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') > -1)) {
        // Header
-       loadInclude('inc/header.php');
+       loadIncludeOnce('inc/header.php');
 
-       // Fix missing array elements here
-       if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
-       if (!isConfigEntrySet('index_cookie')) setConfigEntry('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', '');
+       }
 
-       // 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', '');
-               }
+       // Template laden
+       loadTemplate('index');
 
-               // Template laden
-               LOAD_TEMPLATE('index', false, addUrlData(''));
+       // Shall I insert an automated forward?
+       if (getConfig('index_delay') > 0) {
+               // This will be a JavaScript-redirect!
+               $content['delay']  = (getConfig('index_delay') * 1000 + 500);
+               $content['module'] = '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'  , addUrlData('index'));
-                       LOAD_TEMPLATE('index_forward');
-               } // END - if
-       } else {
-               // Redirect to main page
-               redirectToUrl('modules.php?module=index');
-       }
+               // Load template
+               loadTemplate('index_forward', false, $content);
+       } // END - if
 
        // Footer
-       loadInclude('inc/footer.php');
+       loadIncludeOnce('inc/footer.php');
 } else {
-       // You have to install first!
-       redirectToUrl('install.php');
+       // Redirect to main page
+       redirectToUrl('modules.php?module=index');
 }
 
-// All done here...
-shutdown();
-
-//
+// [EOF]
 ?>