Hotfix

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 57059d512aa23cf3684acfa1e3e8580353de654a..ac9aa57734e26872871a981dd22cab015b100b2b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -15,12 +15,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -47,8 +45,9 @@ require('inc/libs/security_functions.php');
 // Init start time
 $GLOBALS['startTime'] = microtime(true);
 
-// Set module
+// Set module/what
 $GLOBALS['module'] = 'index';
+$GLOBALS['what'] = 'welcome';
 
 // Set CSS mode
 $GLOBALS['output_mode'] = '0';
@@ -56,15 +55,24 @@ $GLOBALS['output_mode'] = '0';
 // Load config.php
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
+// Fix what to 'home'
+setWhat(getIndexHome());
 
-// Fix missing array elements here
-if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
-if (!isConfigEntrySet('index_cookie')) setConfigEntry('index_cookie', 0);
+// Shall we display 'home' in index.php?
+if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) {
+       // Include module (and exit in inc/footer.php)
+       doIncludeModule();
+} // END - if
+
+//////////////////////////////////////////////////
+// Display regular index 'front' page from here
+//////////////////////////////////////////////////
 
 // Check for cookies
 if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
+       // Set content type
+       setContentType('text/html');
+
        // Header
        loadIncludeOnce('inc/header.php');
 
@@ -90,7 +98,7 @@ if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
                loadTemplate('index_forward', false, $content);
        } // END - if
 
-       // Footer
+       // Footer (which will call shutdown() for us)
        loadIncludeOnce('inc/footer.php');
 } else {
        // Redirect to main page