More rewrites of constants and fix for loading mass-included scripts by GET_DIR_AS_AR...

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index dfc8d8717527f630aecc9bb9db743a12999621c5..3e10594f6744bac813a03fd4baeff59f6f8716ab 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -32,55 +32,55 @@
  ************************************************************************/
 
 // 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)
 require("inc/config.php");
 
 // Is the script installed?
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
        // 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();
 
        // Is there a check value?
-       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((isset($_GET['frame'])) && (in_array($_GET['frame'], array("stop", "stop2", "stats", "textlinks"))))) {
+       if ((SURFBAR_CHECK_RELOAD_FULL()) || ((REQUEST_ISSET_GET(('frame'))) && (in_array(REQUEST_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']))) {
+               if (((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == "stop")) || (!REQUEST_ISSET_GET(('frame')))) {
                        // Load template for "start" page
                        LOAD_TEMPLATE("surfbar_frame_start");
 
                        // Load banner
-                       OUTPUT_HTML("<br />");
                        LOAD_TEMPLATE("surfbar_start_banner");
 
                        // This makes the footer appear again
-                       unset($_GET['frame']);
-               } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "stats")) {
+                       REQUEST_UNSET_GET(('frame'));
+               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == "stats")) {
                        // Get total points amount
                        $points = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
 
@@ -98,7 +98,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                        // Load template for "stats" page
                        LOAD_TEMPLATE("surfbar_frame_stats", false, $content);
-               } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "textlinks")) {
+               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == "textlinks")) {
                        // Prepare content
                        $content = array(
                                'online'   => SURFBAR_DETERMINE_TOTAL_ONLINE(),
@@ -118,14 +118,14 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        // Load template for stopped surfbar
                        LOAD_TEMPLATE("surfbar_stopped", false, $content);
                }
-       } elseif ((isset($_GET['check'])) && (isset($_GET['id'])) && (isset($_GET['salt']))) {
+       } elseif ((REQUEST_ISSET_GET(('check'))) && (REQUEST_ISSET_GET(('id'))) && (REQUEST_ISSET_GET(('salt')))) {
                // Dummy next id get
-               SURFBAR_DETERMINE_NEXT_ID($_GET['id']);
+               SURFBAR_DETERMINE_NEXT_ID(REQUEST_GET('id'));
 
                // Check reload lock and validation code
-               if ((!SURFBAR_CHECK_RELOAD_LOCK($_GET['id'])) && (SURFBAR_CHECK_VALIDATION_CODE($_GET['id'], $_GET['check'], $_GET['salt']))) {
+               if ((!SURFBAR_CHECK_RELOAD_LOCK(REQUEST_GET('id'))) && (SURFBAR_CHECK_VALIDATION_CODE(REQUEST_GET('id'), REQUEST_GET('check'), REQUEST_GET('salt')))) {
                        // Lock the URL (id) down
-                       SURFBAR_LOCKDOWN_ID($_GET['id']);
+                       SURFBAR_LOCKDOWN_ID(REQUEST_GET('id'));
 
                        // Code is valid so pay points here
                        SURFBAR_PAY_POINTS();
@@ -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 = "";
@@ -150,7 +150,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                $templateName = SURFBAR_DETERMINE_TEMPLATE_NAME();
 
                // Frame "top" set?
-               if ((isset($_GET['frame'])) && ($_GET['frame'] == "top")) {
+               if ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == "top")) {
                        // Determine next id
                        $nextId = SURFBAR_DETERMINE_NEXT_ID();
 
@@ -175,16 +175,16 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                // Load new URL
                                SURFBAR_RELOAD_TO_STOP_PAGE("stop2");
                        }
-               } elseif ((isset($_GET['frame'])) && ($_GET['frame'] == "start")) {
+               } elseif ((REQUEST_ISSET_GET(('frame'))) && (REQUEST_GET('frame') == "start")) {
                        // Starter frame found so let the footer display
-                       unset($_GET['frame']);
+                       REQUEST_UNSET_GET(('frame'));
                } else {
                        // Load header in frameset mode
                        $isFrameset = true;
                }
 
                // 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,9 +192,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        }
 
        // Load footer
-       require_once(PATH."inc/footer.php");
+       LOAD_INC_ONCE("inc/footer.php");
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }