__ACL_ALLOW rewritten to and @TODO finished

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index eb0060fa43f69b5ea88df499cafd8bde730f0159..db429a70247b7421e03f522d2eb627c862710eec 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -35,13 +35,13 @@
 require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";
 
 // Set this because we have no module in URI
-$GLOBALS['module'] = "show_bonus"; $GLOBALS['output_mode'] = 0;
+$GLOBALS['module'] = "show_bonus";
+$GLOBALS['output_mode'] = 0;
 
 // Load the required file(s)
 require("inc/config.php");
@@ -50,14 +50,14 @@ require("inc/config.php");
 REDIRECT_ON_UNINSTALLED_EXTENSION("bonus");
 
 // List only rankings when script is installed
-if (isBooleanConstantAndTrue('mxchange_installed')) {
+if (isInstalled()) {
        // Include header
        LOAD_INC("inc/header.php");
 
-       if (($_GET['uid'] > 0) && ($_GET['d'] > 0) && (!empty($_GET['t']))) {
+       if ((REQUEST_GET('uid') > 0) && (REQUEST_GET('d') > 0) && (REQUEST_ISSET_GET(('t')))) {
                // Set row name
                $t = "";
-               switch ($_GET['t']) {
+               switch (REQUEST_GET('t')) {
                        case "bonusid": // Bonus mail
                                $t = "bonus_id";
                                break;
@@ -67,7 +67,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                break;
 
                        default: // Invalid type
-                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid type %s detected.", $_GET['t']));
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid type %s detected.", REQUEST_GET('t')));
                                break;
                } // END - switch
 
@@ -80,7 +80,7 @@ RIGHT JOIN `{!_MYSQL_PREFIX!}_bonus_turbo` AS b
 ON d.userid=b.userid
 WHERE d.`status`='CONFIRMED' AND d.userid=%s AND b.%s=%s
 LIMIT 1",
-                               array(bigintval($_GET['uid']), $t, bigintval($_GET['d'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('uid')), $t, bigintval(REQUEST_GET('d'))), __FILE__, __LINE__);
 
                        // Entry found?
                        if (SQL_NUMROWS($result) == 1) {
@@ -93,8 +93,8 @@ LIMIT 1",
                                define('__FNAME'    , $content['family']);
                                define('__RANK'     , BIGINTVAL($content['level']));
                                define('__POINTS'   , TRANSLATE_COMMA($content['points']));
-                               define('__MAILID'   , bigintval($_GET['d']));
-                               define('__RANK_ROWS', BONUS_MAKE_RANK_ROWS(bigintval($_GET['d']), $t, bigintval($_GET['uid'])));
+                               define('__MAILID'   , bigintval(REQUEST_GET('d')));
+                               define('__RANK_ROWS', BONUS_MAKE_RANK_ROWS(bigintval(REQUEST_GET('d')), $t, bigintval(REQUEST_GET('uid'))));
 
                                // Constant created within previous function which contains informations for current user's ranking position:
                                //   __YOUR_RANKING_LINE