Use upcoming functions loadPageHeader() and loadPageFooter() instead of include

files (which made the script slower).

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/ajax.php b/ajax.php
index f0a04892ee3b0276bda0b42147c4b7487f60c0d5..e5808595ddb09a9bfc3fc8ca36f96429b5b1a942 100644 (file)
--- a/ajax.php
+++ b/ajax.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : AJAX-Abfragescript                               *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : AJAX-Abfragescript                               *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -63,7 +58,7 @@ loadIncludeOnce('inc/ajax-functions.php');
 initAjax();
 
 // Load header here
 initAjax();
 
 // Load header here

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Process only POST requests and that at least 'level' is set
 if ((getHttpRequestMethod() == 'POST') && (isPostRequestElementSet('level'))) {
 
 // Process only POST requests and that at least 'level' is set
 if ((getHttpRequestMethod() == 'POST') && (isPostRequestElementSet('level'))) {


@@ -84,7 +79,7 @@ if ((getHttpRequestMethod() == 'POST') && (isPostRequestElementSet('level'))) {
 } // END - if
 
 // Footer
 } // END - if
 
 // Footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/api.php b/api.php
index a6524ae02c1a72f9e44d201ac263210c8cf1939c..dedbd9c5f9dfe332a20dc3a0ee7d4ae4d277a2fc 100644 (file)
--- a/api.php
+++ b/api.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Allgemeines API-Script                           *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Allgemeines API-Script                           *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -63,12 +58,12 @@ require('inc/config-global.php');
 //initApi();
 
 // Load header here
 //initApi();
 
 // Load header here

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // @TODO Do stuff here
 
 // Footer
 
 // @TODO Do stuff here
 
 // Footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/autoreg.php b/autoreg.php
index aa1f7d8404f6a6ab17bcc23070a01f17144671f2..38b93cbe4c02327585b83f8ecd27113a505fe7b9 100644 (file)
--- a/autoreg.php
+++ b/autoreg.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : API-Script fuer ext-autoreg                      *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : API-Script fuer ext-autoreg                      *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -57,12 +52,12 @@ require('inc/config-global.php');
 setContentType('text/plain');
 
 // Load header
 setContentType('text/plain');
 
 // Load header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // @TODO Add processing of request here
 
 // Load footer
 
 // @TODO Add processing of request here
 
 // Load footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/beg.php b/beg.php
index e9877f9699347750c932b7b8820cf53260d88989..226e198a44191dc884702c4184b93b45adec057a 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bettel-Link fuer Mitglieder                      *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bettel-Link fuer Mitglieder                      *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -162,7 +157,7 @@ if (isGetRequestElementSet('userid')) {
                sqlFreeResult($result);
 
                // Include header
                sqlFreeResult($result);
 
                // Include header

-               loadIncludeOnce('inc/header.php');
+               loadPageHeader();

 
                // Load final template
                loadTemplate('beg_link', FALSE, $content);
 
                // Load final template
                loadTemplate('beg_link', FALSE, $content);


@@ -182,7 +177,7 @@ if (isGetRequestElementSet('userid')) {
                }
 
                // Include footer
                }
 
                // Include footer

-               loadIncludeOnce('inc/footer.php');
+               loadPageFooter();

        } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) {
                // Maybe locked/unconfirmed account?
                $errorCode = generateErrorCodeFromUserStatus();
        } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) {
                // Maybe locked/unconfirmed account?
                $errorCode = generateErrorCodeFromUserStatus();

diff --git a/birthday_confirm.php b/birthday_confirm.php
index a54278b22aa227dd12c9475d599e08edadd66128..b8b74210b6e6ba7fc1393b4e2d373981b511d259 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Geburtstagsgutschrift bestaetigen                *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Geburtstagsgutschrift bestaetigen                *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -121,13 +116,13 @@ sqlFreeResult($result);
 $GLOBALS['__module'] = 'birthday_confirm';
 
 // Include header
 $GLOBALS['__module'] = 'birthday_confirm';
 
 // Include header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Load final template and output it
 loadTemplate('birthday_confirm', FALSE, $content);
 
 // Include footer
 
 // Load final template and output it
 loadTemplate('birthday_confirm', FALSE, $content);
 
 // Include footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/cron.php b/cron.php
index acf0639bc6f702b378af4ba2261a142bd56850df..14721d1e07414c7672949dfa6db85c63c0e2d3d3 100644 (file)
--- a/cron.php
+++ b/cron.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Cronjob-Script fuer externen/lokalen Aufruf      *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Cronjob-Script fuer externen/lokalen Aufruf      *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -57,12 +52,12 @@ $GLOBALS['__footer_sent'] = 2;
 require('inc/config-global.php');
 
 // Load header here
 require('inc/config-global.php');
 
 // Load header here

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // @TODO Do stuff here
 
 // Footer
 
 // @TODO Do stuff here
 
 // Footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/css.php b/css.php
index 08ae246a690d4e71f45e974e29042e03c6bc7778..3b8a281387a191762125a988bda8e3176f8d6645 100644 (file)
--- a/css.php
+++ b/css.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Ausgabe der Cascading-Style-Sheets (CSS)         *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Ausgabe der Cascading-Style-Sheets (CSS)         *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -55,13 +50,13 @@ require('inc/config-global.php');
 setContentType('text/css');
 
 // Load header
 setContentType('text/css');
 
 // Load header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Load CSS code
 loadInclude('inc/stylesheet.php');
 
 // Load footer
 
 // Load CSS code
 loadInclude('inc/stylesheet.php');
 
 // Load footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/doubler.php b/doubler.php
index 46f16f9122829361268eb60b0b08369c2629307e..a9b0a2ce5005b0a50cbf72b68a9c267c9a4ce8eb 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Punkteverdoppler                                 *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Punkteverdoppler                                 *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -177,7 +172,7 @@ if (getDoublerSendMode() == 'DIRECT') {
 } // END - if
 
 // Output header
 } // END - if
 
 // Output header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 if (isValidUserData()) {
        // Transfer userid/nickname to constant
 
 if (isValidUserData()) {
        // Transfer userid/nickname to constant


@@ -206,7 +201,7 @@ $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC');
 loadTemplate('doubler_index', FALSE, $content);
 
 // Output footer
 loadTemplate('doubler_index', FALSE, $content);
 
 // Output footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/img.php b/img.php
index d9780a6b229ef3d999c041ed15a8ba486298452c..aa6fd1f2e7bd08b1a80ca9cff73ba825edd3d32a 100644 (file)
--- a/img.php
+++ b/img.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -49,7 +44,7 @@ $GLOBALS['__output_mode'] = -3;
 require('inc/config-global.php');
 
 // Load header
 require('inc/config-global.php');
 
 // Load header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Code set?
 if (isGetRequestElementSet('code')) {
 
 // Code set?
 if (isGetRequestElementSet('code')) {


@@ -67,7 +62,7 @@ if (isGetRequestElementSet('code')) {
 }
 
 // Finish generation here
 }
 
 // Finish generation here

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/inc/footer.php b/inc/footer.php
index 37a86adf4b3523f64e2f0ebd4c07dcea9b3b00b9..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -1,63 +1,3 @@
 <?php
 <?php

-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
- * ===================                          Last change: 10/23/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : footer.php                                       *
- * -------------------------------------------------------------------- *
- * Short description : Add the HTML code for the footer                 *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Den Fuss des HTML-Codes hinzufuegen              *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * 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 *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if (!defined('__SECURITY')) {
-       die();
-} // END - if
-
-// Init page footer
-$GLOBALS['__page_footer'] = '';
-
-// Footer disabled (e.g. CSS/AJAX/image output) or already sent?
-// 1234      5                         54    45                              5    5                              543    3                443    3                 443    3                  44321
-if ((((!isset($GLOBALS['__footer_sent'])) || (($GLOBALS['__footer_sent'] != 1) && ($GLOBALS['__footer_sent'] != 2))) && (!isCssOutputMode()) && (!isAjaxOutputMode()) && (!isImageOutputMode()))) {
-       // Run the filter, sweet huh?
-       runFilterChain('page_footer');
-
-       // Load page footer
-       $GLOBALS['__page_footer'] .= loadTemplate('page_footer', TRUE);
-} // END - if
-
-// Footer has been reached
-$GLOBALS['__footer_sent'] = 1;
-
-// Shutdown
-doShutdown();
-
-// [EOF]
+// @DEPRECATED

 ?>
 ?>

diff --git a/inc/header.php b/inc/header.php
index 7dbc6b3e324e7825e7828fd7c5285a4f985ab5a1..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -1,73 +1,3 @@
 <?php
 <?php

-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
- * ===================                          Last change: 11/24/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : header.php                                       *
- * -------------------------------------------------------------------- *
- * Short description : Outputs header HTML code, will not when frameset *
- *           is active                                                  *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Gibt nur dann HTML-Code fuer den Kopf-Bereich    *
- *           aus, wenn Frameset nicht aktiv ist                         *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * 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 *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if (!defined('__SECURITY')) {
-       die();
-} // END - if
-
-// Init header
-$GLOBALS['__page_header'] = '';
-
-// Is the header already sent?
-if (($GLOBALS['__header_sent'] != 1) && ($GLOBALS['__header_sent'] != 2)) {
-       // Set default HTTP status to "200 OK"
-       setHttpStatus('200 OK');
-
-       // If not in CSS mode generate the header
-       if ((!isCssOutputMode()) && (!isAjaxOutputMode()) && (!isImageOutputMode())) {
-               // Prepare the header for HTML output
-               loadHtmlHeader();
-       } // END - if
-
-       // Closing HEAD tag
-       if ($GLOBALS['__header_sent'] == '0') {
-               $GLOBALS['__header_sent'] = 1;
-       } // END - if
-} // END - if
-
-// Add BODY tag or not?
-// @TODO Find a way to not use direct module comparison
-if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['__header_sent'] == 1) && (getModule() != 'frametester') && (!isFramesetModeEnabled())) {
-       loadTemplate('page_body');
-       $GLOBALS['__header_sent'] = 2;
-} // END - if
-
-// [EOF]
+// @DEPRECATED

 ?>
 ?>

diff --git a/inc/module-functions.php b/inc/module-functions.php
index f7779d051a753df268060d7f378ae2ae5d2203b7..49845ac804116d8e44d083ecacd8b037bb09bc23 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Modulfunktionen                                  *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Modulfunktionen                                  *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -488,8 +483,8 @@ function doIncludeModule () {
        // Set content type
        setContentType('text/html');
 
        // Set content type
        setContentType('text/html');
 

-       // The header file
-       loadIncludeOnce('inc/header.php');
+       // Load page header
+       loadPageHeader();

 
        // Modules are by default not valid!
        $isModuleValid = FALSE;
 
        // Modules are by default not valid!
        $isModuleValid = FALSE;


@@ -522,7 +517,7 @@ function doIncludeModule () {
        } // END - if
 
        // Add the footer (this will call doShutdown())
        } // END - if
 
        // Add the footer (this will call doShutdown())

-       loadIncludeOnce('inc/footer.php');
+       loadPageFooter();

 }
 
 // "Getter" for menu mode from given module
 }
 
 // "Getter" for menu mode from given module

diff --git a/index.php b/index.php
index ee98e09d63732c73af78cb792fcc24848a3243d1..329b0c2bcb91a2d05ccd95ca5df6fd126f076731 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,11 +11,6 @@
  * 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) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -58,7 +53,7 @@ setWhat(getIndexHome());
 
 // Shall we display 'home' in index.php?
 if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) {
 
 // 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
 


@@ -72,7 +67,7 @@ if ((isSessionVariableSet('visited')) || (getIndexDelay() > -1)) {
        setContentType('text/html');
 
        // Header
        setContentType('text/html');
 
        // Header

-       loadIncludeOnce('inc/header.php');
+       loadPageHeader();

 
        // 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) {


@@ -97,7 +92,7 @@ if ((isSessionVariableSet('visited')) || (getIndexDelay() > -1)) {
        } // END - if
 
        // Footer (which will call doShutdown() for us)
        } // END - if
 
        // Footer (which will call doShutdown() for us)

-       loadIncludeOnce('inc/footer.php');
+       loadPageFooter();

 } else {
        // Redirect to main page
        redirectToUrl('modules.php?module=index');
 } else {
        // Redirect to main page
        redirectToUrl('modules.php?module=index');

diff --git a/install.php b/install.php
index 44559e8996c18575855e1465f0f924df3eee409f..948cbd9af6e328dc84e59150d7671c93ac154a6a 100644 (file)
--- a/install.php
+++ b/install.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Installationsscript.                             *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Installationsscript.                             *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -73,7 +68,7 @@ if ((isInstalled()) && (getRequestElement('install_page') != 'finished')) {
 } // END - if
 
 // Load header here
 } // END - if
 
 // Load header here

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Handle fatal errors
 runFilterChain('handle_fatal_errors');
 
 // Handle fatal errors
 runFilterChain('handle_fatal_errors');


@@ -110,7 +105,7 @@ if (isGetRequestElementSet('installer')) {
 }
 
 // Footer
 }
 
 // Footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/js.php b/js.php
index 5594b86993c92f76793bacf83324b8cc1bf4c4f7..287edd29c34ac2b74d72fb843f932ba2211056e2 100644 (file)
--- a/js.php
+++ b/js.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Code-Bild fuer verschiedene Zwecke               *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -66,7 +61,7 @@ setHttpStatus('404 Not Found');
 // Is 'js' is provied?
 if (isGetRequestElementSet('js')) {
        // Load header
 // Is 'js' is provied?
 if (isGetRequestElementSet('js')) {
        // Load header

-       loadIncludeOnce('inc/header.php');
+       loadPageHeader();

 
        // Prepare include file for looking
        $inc = sprintf('inc/js/js-%s.php', getRequestElement('js'));
 
        // Prepare include file for looking
        $inc = sprintf('inc/js/js-%s.php', getRequestElement('js'));


@@ -81,7 +76,7 @@ if (isGetRequestElementSet('js')) {
        } // END - if
 
        // Load footer
        } // END - if
 
        // Load footer

-       loadIncludeOnce('inc/footer.php');
+       loadPageFooter();

 } // END - if
 
 // Shutdown
 } // END - if
 
 // Shutdown

diff --git a/lead-confirm.php b/lead-confirm.php
index 34deb6a63f18fcbfd6d33e29dbaa79fa2136b59b..12b61064b5b64c97d063482462e4e9464c40fb17 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alles um den Bestaetigungslink                   *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alles um den Bestaetigungslink                   *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -55,7 +50,7 @@ setContentType('text/html');
 redirectOnUninstalledExtension('lead');
 
 // Header
 redirectOnUninstalledExtension('lead');
 
 // Header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Initialize the array for the template
 $content = array(
 
 // Initialize the array for the template
 $content = array(


@@ -76,7 +71,7 @@ if ((isSessionVariableSet('lead_userid')) && (fetchUserData(getSession('lead_use
 loadTemplate('lead_code', FALSE, $content);
 
 // Footer
 loadTemplate('lead_code', FALSE, $content);
 
 // Footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/mailid.php b/mailid.php
index a1b85addaad04d28b3a00b67fdfea1f53e31fdf1..90a2210fad852c7bfab2b8a7f2010c78bd29cf6e 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bestaetigung von Mails                           *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bestaetigung von Mails                           *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -89,7 +84,7 @@ if ((isValidId($data['userid'])) && (isValidId($data['id'])) && (!empty($data['t
        // No image?
        if ($data['do'] != 'img') {
                // ... then output header
        // No image?
        if ($data['do'] != 'img') {
                // ... then output header

-               loadIncludeOnce('inc/header.php');
+               loadPageHeader();

        } // END - fi
 
        // Init result for below sqlNumRows() function
        } // END - fi
 
        // Init result for below sqlNumRows() function


@@ -254,7 +249,7 @@ handleMailIdErrorCode($data['error_code']);
 // Insert footer if no image
 if ($data['do'] != 'img') {
        // Write footer
 // Insert footer if no image
 if ($data['do'] != 'img') {
        // Write footer

-       loadIncludeOnce('inc/footer.php');
+       loadPageFooter();

 } // END - if
 
 // Really all done here... ;-)
 } // END - if
 
 // Really all done here... ;-)

diff --git a/network-delurl.php b/network-delurl.php
index c05da152fc7c67403a2c0d93851030e69741f775..3f51c9f09e78d8aaa07fb149ccb0385b761c0d04 100644 (file)
--- a/network-delurl.php
+++ b/network-delurl.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : VCheck Script fuer Erweiterung ext-network       *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : VCheck Script fuer Erweiterung ext-network       *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -55,7 +50,7 @@ setHttpStatus('500 Internal Server Error');
 setContentType('text/plain');
 
 // Load header
 setContentType('text/plain');
 
 // Load header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Is the required extension installed?
 if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {
 
 // Is the required extension installed?
 if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {


@@ -64,7 +59,7 @@ if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {
 } // END - if
 
 // Load footer
 } // END - if
 
 // Load footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/network-vcheck.php b/network-vcheck.php
index e18e81a16bcf7248f8ff912be0fb35be1d9cc3ae..ce7a708a55a4d677f9b7614a6a0d326ecd9363fc 100644 (file)
--- a/network-vcheck.php
+++ b/network-vcheck.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : VCheck Script fuer Erweiterung ext-network       *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : VCheck Script fuer Erweiterung ext-network       *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -55,7 +50,7 @@ setHttpStatus('500 Internal Server Error');
 setContentType('text/plain');
 
 // Load header
 setContentType('text/plain');
 
 // Load header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 // Is the required extension installed?
 if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {
 
 // Is the required extension installed?
 if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {


@@ -64,7 +59,7 @@ if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) {
 } // END - if
 
 // Load footer
 } // END - if
 
 // Load footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/show_bonus.php b/show_bonus.php
index daffd41d3d372750a2f31112139add9581fd10f6..c5812223ef430fd04af96fc2ac6a38710a9d9bc9 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Rankliste fuer Turbo-Bonus anzeigen              *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Rankliste fuer Turbo-Bonus anzeigen              *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -55,7 +50,7 @@ setContentType('text/html');
 redirectOnUninstalledExtension('bonus');
 
 // Include header
 redirectOnUninstalledExtension('bonus');
 
 // Include header

-loadIncludeOnce('inc/header.php');
+loadPageHeader();

 
 if ((isValidId(getRequestElement('userid'))) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
        // Set row name
 
 if ((isValidId(getRequestElement('userid'))) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
        // Set row name


@@ -132,7 +127,7 @@ LIMIT 1",
 loadTemplate('show_bonus', FALSE, $content);
 
 // Include footer
 loadTemplate('show_bonus', FALSE, $content);
 
 // Include footer

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>

diff --git a/surfbar.php b/surfbar.php
index d94497b2a06c45529d8d1a78d8665c5cbbd1cd2d..700bd62c77dd4c794e72d0c8d805cbb6c527120d 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Die Surfbar selbst                               *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Die Surfbar selbst                               *
  * -------------------------------------------------------------------- *

- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *

  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *


@@ -74,7 +69,7 @@ if (!isMember()) {
                        redirectToUrl($url);
                } else {
                        // Load header
                        redirectToUrl($url);
                } else {
                        // Load header

-                       loadIncludeOnce('inc/header.php');
+                       loadPageHeader();

 
                        // Is there a 'code' provided?
                        if (isGetRequestElementSet('code')) {
 
                        // Is there a 'code' provided?
                        if (isGetRequestElementSet('code')) {


@@ -89,7 +84,7 @@ if (!isMember()) {
                        $GLOBALS['__header_sent'] = 2;
 
                        // Load footer
                        $GLOBALS['__header_sent'] = 2;
 
                        // Load footer

-                       loadIncludeOnce('inc/footer.php');
+                       loadPageFooter();

                }
        } else {
                // Redirect
                }
        } else {
                // Redirect


@@ -107,7 +102,7 @@ doSurfbarSelfMaintenance();
 if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
        // Reload-lock is full, surfbar stopped so...
        // Load header
 if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('frame'), array('stop', 'stop2', 'stats', 'textlinks'))))) {
        // Reload-lock is full, surfbar stopped so...
        // Load header

-       loadIncludeOnce('inc/header.php');
+       loadPageHeader();

 
        // Load template
        if (((!isFullPage()) && (getRequestElement('frame') == 'stop2')) || (isFullPage())) {
 
        // Load template
        if (((!isFullPage()) && (getRequestElement('frame') == 'stop2')) || (isFullPage())) {


@@ -165,13 +160,13 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
                } // END - if
 
                // Load header to avoid a bug
                } // END - if
 
                // Load header to avoid a bug

-               loadIncludeOnce('inc/header.php');
+               loadPageHeader();

        } else {
                // Reload to stop frame!
                redirectToSurfbarStopPage();
        }
 
        } else {
                // Reload to stop frame!
                redirectToSurfbarStopPage();
        }
 

-       // All done, so fix notice for footer.php
+       // All done, so fix notice for loadTemplateFooter()

        $GLOBALS['__footer_sent'] = 1;
 } else {
        // Prepare content
        $GLOBALS['__footer_sent'] = 1;
 } else {
        // Prepare content


@@ -203,7 +198,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
        }
 
        // Load header
        }
 
        // Load header

-       loadIncludeOnce('inc/header.php');
+       loadPageHeader();

 
        // Determine template name
        $templateName = determineSurfbarTemplateName();
 
        // Determine template name
        $templateName = determineSurfbarTemplateName();


@@ -215,7 +210,7 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement('
 
 // Load footer
 $GLOBALS['__footer_sent'] = 3;
 
 // Load footer
 $GLOBALS['__footer_sent'] = 3;

-loadIncludeOnce('inc/footer.php');
+loadPageFooter();

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>