X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=surfbar.php;h=5ed6a8aff7efde8a9addcd5d4a00175840e835d8;hp=02d12ccf14e960d173056b05761b3c2247616e25;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hpb=701f5ac005404813e0e546102b5821f2ba2af522
diff --git a/surfbar.php b/surfbar.php
index 02d12ccf14..5ed6a8aff7 100644
--- a/surfbar.php
+++ b/surfbar.php
@@ -32,18 +32,18 @@
************************************************************************/
// 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;
-$SURFBAR_CACHE = array();
+$GLOBALS['cache_array']['surfbar'] = array();
$GLOBALS['startTime'] = microtime(true);
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
// Set module
$GLOBALS['module'] = "surfbar";
$GLOBALS['refid'] = 0;
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
$msg = null;
// Load the required file(s)
@@ -52,13 +52,14 @@ require("inc/config.php");
// Is the script installed?
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");
- } elseif (!IS_MEMBER()) {
+ REDIRECT_ON_UNINSTALLED_EXTENSION("surfbar");
+
+ // No member?
+ if (!IS_MEMBER()) {
// Redirect
+ // @TODO Display quick login form here or redirect as configured
LOAD_URL("modules.php?module=index");
- }
+ } // END - if
// Handle tasks on self-maintenance
SURFBAR_HANDLE_SELF_MAINTENANCE();
@@ -67,7 +68,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 +76,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
LOAD_TEMPLATE("surfbar_frame_start");
// Load banner
- OUTPUT_HTML("
");
LOAD_TEMPLATE("surfbar_start_banner");
// This makes the footer appear again
@@ -141,7 +141,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
}
// All done, so fix notice for footer.php
- $footer = 1;
+ $GLOBALS['footer_sent'] = 1;
} else {
// Prepare content
$content = "";
@@ -184,7 +184,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}
\ncontent=
".print_r($content, true).""); @@ -192,7 +192,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");