Added more wrapper, commented out another noisy debug line

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 1cfa8c12d9ebeab4b329c911e80c2990cd606218..a07f405aa42d578f40957f51a322205afa290ffb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,8 +17,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 - 2012 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 *
@@ -43,23 +43,34 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);
 
-// Set module/what
-$GLOBALS['module'] = 'index';
-$GLOBALS['what'] = 'index';
-
-// Set CSS mode
-$GLOBALS['output_mode'] = '0';
+// Set module/what and output mode
+$GLOBALS['__module']      = 'index';
+$GLOBALS['__what']        = 'welcome';
+$GLOBALS['__output_mode'] = '0';
 
 // Load config.php
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
+// Fix what to 'home'
+setWhat(getIndexHome());
+
+// 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');
 
@@ -85,7 +96,7 @@ if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
                loadTemplate('index_forward', false, $content);
        } // END - if
 
-       // Footer
+       // Footer (which will call doShutdown() for us)
        loadIncludeOnce('inc/footer.php');
 } else {
        // Redirect to main page