projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introduced isSqlResult() which encapsulates checking MySQL/i results
[mailer.git]
/
index.php
diff --git
a/index.php
b/index.php
index a2764b899f3b62421bb9a9fbe89e21976f28d937..0422155a3502e9d255fa459fa2b863be8b767f9b 100644
(file)
--- a/
index.php
+++ b/
index.php
@@
-11,13
+11,8
@@
* Kurzbeschreibung : Index-Seite. Eine simple Weiterleitung auf die *
* modules.php *
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Index-Seite. Eine simple Weiterleitung auf die *
* modules.php *
* -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $Date:: $ *
- * $Tag:: 0.2.1-FINAL $ *
- * $Author:: $ *
- * -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 201
1
by Mailer Developer Team *
+ * Copyright (c) 2009 - 201
6
by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-43,24
+38,22
@@
require('inc/libs/security_functions.php');
// Init start time
require('inc/libs/security_functions.php');
// Init start time
-$GLOBALS['startTime'] = microtime(true);
-
-// Set module/what
-$GLOBALS['__module'] = 'index';
-$GLOBALS['__what'] = 'welcome';
+$GLOBALS['__start_time'] = microtime(TRUE);
-// 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');
+//
Initialize application
+require('inc/
init
.php');
// Fix what to 'home'
setWhat(getIndexHome());
// Shall we display 'home' in index.php?
if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) {
// 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)
+ // Include module
doIncludeModule();
} // END - if
doIncludeModule();
} // END - if
@@
-69,12
+62,12
@@
if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIn
//////////////////////////////////////////////////
// Check for cookies
//////////////////////////////////////////////////
// Check for cookies
-if ((isSessionVariableSet('visited')) || (get
Config('index_delay'
) > -1)) {
+if ((isSessionVariableSet('visited')) || (get
IndexDelay(
) > -1)) {
// Set content type
setContentType('text/html');
// Header
// Set content type
setContentType('text/html');
// Header
- load
IncludeOnce('inc/header.php'
);
+ load
PageHeader(
);
// Is the index page configured for redirect pr not?
if (getConfig('index_cookie') > 0) {
// Is the index page configured for redirect pr not?
if (getConfig('index_cookie') > 0) {
@@
-89,17
+82,17
@@
if ((isSessionVariableSet('visited')) || (getConfig('index_delay') > -1)) {
loadTemplate('index');
// Shall I insert an automated forward?
loadTemplate('index');
// Shall I insert an automated forward?
- if (get
Config('index_delay'
) > 0) {
+ if (get
IndexDelay(
) > 0) {
// This will be a JavaScript-redirect!
// This will be a JavaScript-redirect!
- $content['delay'] = (get
Config('index_delay'
) * 1000 + 500);
+ $content['delay'] = (get
IndexDelay(
) * 1000 + 500);
$content['module'] = 'index';
// Load template
$content['module'] = 'index';
// Load template
- loadTemplate('index_forward',
false
, $content);
+ loadTemplate('index_forward',
FALSE
, $content);
} // END - if
} // END - if
- // Footer (which will call
s
hutdown() for us)
- load
IncludeOnce('inc/footer.php'
);
+ // Footer (which will call
doS
hutdown() for us)
+ load
PageFooter(
);
} else {
// Redirect to main page
redirectToUrl('modules.php?module=index');
} else {
// Redirect to main page
redirectToUrl('modules.php?module=index');