Ticket resolved, code rewrites and caching:

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 02d12ccf14e960d173056b05761b3c2247616e25..5adb2f674e61a21edcc48d880a8cb96aaea72631 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action, $startTime, $SURFBAR_CACHE;
@@ -54,7 +54,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Only logged in users may use this surfbar!
        if (!EXT_IS_ACTIVE("surfbar")) {
                // Surfbar deactivated
-               LOAD_URL("modules.php?module=login&msg=".CODE_EXTENSION_PROBLEM."&ext=surfbar");
+               LOAD_URL("modules.php?module=login&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=surfbar");
        } elseif (!IS_MEMBER()) {
                // Redirect
                LOAD_URL("modules.php?module=index");
@@ -67,7 +67,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
                // Reload-lock is full, surfbar stopped so...
                // Load header
-               require_once(PATH."inc/header.php");
+               LOAD_INC_ONCE("inc/header.php");
 
                // Load template
                if (((isset($_GET['frame'])) && ($_GET['frame'] == "stop")) || (!isset($_GET['frame']))) {
@@ -75,7 +75,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        LOAD_TEMPLATE("surfbar_frame_start");
 
                        // Load banner
-                       OUTPUT_HTML("<br />");
                        LOAD_TEMPLATE("surfbar_start_banner");
 
                        // This makes the footer appear again
@@ -184,7 +183,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                }
 
                // Load header
-               require_once(PATH."inc/header.php");
+               LOAD_INC_ONCE("inc/header.php");
 
                // Load that template
                //* DEBUG: */ die("templateName={$templateName}<br />\n<strong>content</strong>=<pre>".print_r($content, true)."</pre>");
@@ -192,7 +191,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Load footer
-       require_once(PATH."inc/footer.php");
+       LOAD_INC_ONCE("inc/footer.php");
 } else {
        // You have to install first!
        LOAD_URL("install.php");