X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=index.php;h=ee98e09d63732c73af78cb792fcc24848a3243d1;hp=7fcc50585069ed2ad95d795991ed581fb859b630;hb=4373e155854012d687fdfcae4c69d1a940883fab;hpb=482683e9be72b5d24784f106a0bcc46e4dbfe0b1

diff --git a/index.php b/index.php
index 7fcc505850..ee98e09d63 100644
--- 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 - 2013 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 *
@@ -45,27 +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
 
-// Fix missing array elements here
-if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
-if (!isConfigEntrySet('index_cookie')) setConfigEntry('index_cookie', 0);
+//////////////////////////////////////////////////
+// Display regular index 'front' page from here
+//////////////////////////////////////////////////
 
 // Check for cookies
-if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
+if ((isSessionVariableSet('visited')) || (getIndexDelay() > -1)) {
+	// Set content type
+	setContentType('text/html');
+
 	// Header
 	loadIncludeOnce('inc/header.php');
 
@@ -82,16 +87,16 @@ if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
 	loadTemplate('index');
 
 	// Shall I insert an automated forward?
-	if (getConfig('index_delay') > 0) {
+	if (getIndexDelay() > 0) {
 		// This will be a JavaScript-redirect!
-		$content['delay']  = (getConfig('index_delay') * 1000 + 500);
+		$content['delay']  = (getIndexDelay() * 1000 + 500);
 		$content['module'] = 'index';
 
 		// Load template
-		loadTemplate('index_forward', false, $content);
+		loadTemplate('index_forward', FALSE, $content);
 	} // END - if
 
-	// Footer
+	// Footer (which will call doShutdown() for us)
 	loadIncludeOnce('inc/footer.php');
 } else {
 	// Redirect to main page