X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=index.php;h=ee98e09d63732c73af78cb792fcc24848a3243d1;hp=8fd966d61e3a5a731f03204c59e04bc32331edca;hb=4373e155854012d687fdfcae4c69d1a940883fab;hpb=5ce904210587c51796b1a2f2d7eef96b2f54263a

diff --git a/index.php b/index.php
index 8fd966d61e..ee98e09d63 100644
--- a/index.php
+++ b/index.php
@@ -17,8 +17,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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 *
@@ -43,14 +43,12 @@
 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'] = 'welcome';
-
-// 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');
@@ -60,45 +58,49 @@ setWhat(getIndexHome());
 
 // Shall we display 'home' in index.php?
 if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) {
-	// Include module
+	// Include module (and exit in inc/footer.php)
 	doIncludeModule();
-} else {
-	// Check for cookies
-	if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
-		// Set content type
-		setContentType('text/html');
-
-		// 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
-			setSession('visited', 'true');
-		} elseif (isSessionVariableSet('visited')) {
-			// Remove cookie when admin set 0 in setup
-			setSession('visited', '');
-		}
-
-		// Template laden
-		loadTemplate('index');
-
-		// 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['module'] = 'index';
-
-			// Load template
-			loadTemplate('index_forward', false, $content);
-		} // END - if
-
-		// Footer (which will call shutdown() for us)
-		loadIncludeOnce('inc/footer.php');
-	} else {
-		// Redirect to main page
-		redirectToUrl('modules.php?module=index');
+} // END - if
+
+//////////////////////////////////////////////////
+// Display regular index 'front' page from here
+//////////////////////////////////////////////////
+
+// Check for cookies
+if ((isSessionVariableSet('visited')) || (getIndexDelay() > -1)) {
+	// Set content type
+	setContentType('text/html');
+
+	// 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
+		setSession('visited', 'true');
+	} elseif (isSessionVariableSet('visited')) {
+		// Remove cookie when admin set 0 in setup
+		setSession('visited', '');
 	}
+
+	// Template laden
+	loadTemplate('index');
+
+	// Shall I insert an automated forward?
+	if (getIndexDelay() > 0) {
+		// This will be a JavaScript-redirect!
+		$content['delay']  = (getIndexDelay() * 1000 + 500);
+		$content['module'] = 'index';
+
+		// Load template
+		loadTemplate('index_forward', FALSE, $content);
+	} // END - if
+
+	// Footer (which will call doShutdown() for us)
+	loadIncludeOnce('inc/footer.php');
+} else {
+	// Redirect to main page
+	redirectToUrl('modules.php?module=index');
 }
 
 // [EOF]