Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 0a97f1cea63ad362e05e4225c1e35544cdddcb6c..0b36b260e199efebecd8938b7dd40b71fc3eb78b 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (getConfig('bonus_active') == "Y") {
        // Shall I withdraw now?
-       if (isset($_POST['withdraw'])) {
+       if (REQUEST_ISSET_POST(('withdraw'))) {
                // Okay, let's prepare...
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
@@ -65,17 +65,17 @@ if (getConfig('bonus_active') == "Y") {
        }
 
        // Autopurge installed?
-       $LAST = "%s"; $ONLINE = "";
+       $lastOnline = "%s"; $ONLINE = "";
        if (EXT_IS_ACTIVE("autopurge")) {
                // Use last online timestamp to keep inactive members away from here
-               $LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+               $lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
                $ONLINE = getConfig('ap_inactive_since');
        }
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
 FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `status`='CONFIRMED' AND ".$USE." > 0".$LAST."
+WHERE `status`='CONFIRMED' AND ".$USE." > 0".$lastOnline."
 ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 
@@ -118,7 +118,7 @@ ORDER BY points DESC, last_online DESC, userid",
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
                } else {
                        // Display message "no manual withdraw possible"
-                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{!ADMIN_BONUS_ALREADY_WITHDRAW!}</div>");
+                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>");
                }
 
                // Prepare constant for timemark