Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 4eb6036f9483682e9ec5f84fa522bf4c2ac38422..57059d512aa23cf3684acfa1e3e8580353de654a 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                                        *
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,6 +38,9 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
+// XDEBUG call
+//* DEBUG: */ xdebug_start_trace();
+
 // Load security stuff here
 require('inc/libs/security_functions.php');
 
@@ -46,8 +50,8 @@ $GLOBALS['startTime'] = microtime(true);
 // Set module
 $GLOBALS['module'] = 'index';
 
-// Set 'CSS-Mode'
-$GLOBALS['output_mode'] = 0;
+// Set CSS mode
+$GLOBALS['output_mode'] = '0';
 
 // Load config.php
 require('inc/config-global.php');
@@ -55,15 +59,15 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
-// Header
-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);
 
 // Check for cookies
-if ((isSessionVariableSet('visited')) || (getConfig('index_delay') == 0) || (getConfig('index_cookie') == 0)) {
+if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
+       // Header
+       loadIncludeOnce('inc/header.php');
+
        // Is the index page configured for redirect pr not?
        if (getConfig('index_cookie') > 0) {
                // Set cookie and remeber it for specified time
@@ -79,19 +83,19 @@ if ((isSessionVariableSet('visited')) || (getConfig('index_delay') == 0) || (get
        // 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['mod']   = 'index';
+               $content['delay']  = (getConfig('index_delay') * 1000 + 500);
+               $content['module'] = 'index';
 
                // Load template
                loadTemplate('index_forward', false, $content);
        } // END - if
+
+       // Footer
+       loadIncludeOnce('inc/footer.php');
 } else {
        // Redirect to main page
        redirectToUrl('modules.php?module=index');
 }
 
-// Footer
-loadIncludeOnce('inc/footer.php');
-
 // [EOF]
 ?>