Filters should be executed even when sql_patches is out-dated

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 11e2b2f5c6db3931e4358d543efdc24edde2b5de..e13c8536ac0a912c6ce8b2efa008e3dc7a012a37 100644 (file)
--- a/index.php
+++ b/index.php
@@ -37,12 +37,11 @@
  * 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';
@@ -51,52 +50,49 @@ $GLOBALS['module'] = 'index';
 $GLOBALS['output_mode'] = '0';
 
 // Load config.php
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the script installed?
-if (isInstalled()) {
-       // Header
-       LOAD_INC('inc/header.php');
-
-       // Fix missing array elements here
-       if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
-       if (!isConfigEntrySet('index_cookie')) setConfigEntry('index_cookie', 0);
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
 
-       // 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
-                       set_session('visited', 'true');
-               } elseif (isSessionVariableSet('visited')) {
-                       // Remove cookie when admin set 0 in setup
-                       set_session('visited', '');
-               }
+// 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 (getConfig('index_delay') > 0) {
-                       // This will be a JavaScript-redirect!
-                       define('__DELAY_VALUE', (getConfig('index_delay') * 1000 + 500));
-                       define('__MOD_VALUE'  , ADD_URL_DATA('index'));
-                       LOAD_TEMPLATE('index_forward');
-               } // END - if
-       } else {
-               // Redirect to main page
-               LOAD_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
-       LOAD_INC('inc/footer.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 {
-       // You have to install first!
-       LOAD_URL('install.php');
+       // Redirect to main page
+       redirectToUrl('modules.php?module=index');
 }
 
-// All done here...
-shutdown();
+// Footer
+loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>