Migration of stelzi's commit 1022 with some changes so we have a nicer code. See...

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 80da5beba5f4784b0a8ee04a6c0b4e798fc9f813..8b38b1e2e352f7d2b731d572a9e1f8007dc2f6b3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -37,7 +37,7 @@
  * 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"
@@ -51,12 +51,12 @@ $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
-       loadInclude('inc/header.php');
+       loadIncludeOnce('inc/header.php');
 
        // Fix missing array elements here
        if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
@@ -74,13 +74,13 @@ if (isInstalled()) {
                }
 
                // Template laden
-               LOAD_TEMPLATE('index', false, addUrlData(''));
+               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'  , addUrlData('index'));
+                       define('__MOD_VALUE'  , 'index');
                        LOAD_TEMPLATE('index_forward');
                } // END - if
        } else {
@@ -89,7 +89,7 @@ if (isInstalled()) {
        }
 
        // Footer
-       loadInclude('inc/footer.php');
+       loadIncludeOnce('inc/footer.php');
 } else {
        // You have to install first!
        redirectToUrl('install.php');