Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / surfbar.php

diff --git a/surfbar.php b/surfbar.php
index 5ed6a8aff7efde8a9addcd5d4a00175840e835d8..01ddd7e57ac7de9a95560f288dfd63f636b26ce9 100644 (file)
--- a/surfbar.php
+++ b/surfbar.php
@@ -65,13 +65,13 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        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
                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");
 
@@ -79,8 +79,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        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();
@@ -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,9 +175,9 @@ 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;