From 7b655a7b6b748dbcd0aa306420d1c45a1c8f98b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 12 Sep 2011 22:08:16 +0000 Subject: [PATCH] Lesser 'tab-bed coded' is better --- index.php | 78 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/index.php b/index.php index 4f8022b89a..ac9aa57734 100644 --- a/index.php +++ b/index.php @@ -60,45 +60,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')) || (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'); } // [EOF] -- 2.39.5