Some variable rewrites

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 5ceee1324997971c3911fa6e26505e4f55a7c0f6..6679aa5f2f064599b1d22c78719a2494b144002c 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -38,14 +38,12 @@ if (!defined('__SECURITY')) {
 }
 
 // This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' !
-function BONUS_ADD_TURBO_POINTS($mid, $uid, $type) {
-       global $_CONFIG;
-
+function BONUS_ADD_TURBO_POINTS ($mid, $uid, $type) {
        // Shall we add bonus points?
-       if (getConfig('bonus_active') == "N") return false;
+       if (getConfig('bonus_active') != "Y") return false;
 
        // Init variables
-       $SQL = ""; $bonys = 0; $mail = 0; $column = "";
+       $sql = ""; $bonys = 0; $mail = 0; $column = "";
 
        // Select SQL command
        switch ($type)
@@ -73,7 +71,7 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type) {
 
        // Check for entry
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM  `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE userid=%s AND %s=%s LIMIT 1",
-               array($uid, $column, $mid), __FILE__, __LINE__);
+               array($uid, $column, $mid), __FUNCTION__, __LINE__);
 
        // Load clicks from table as current rank
        list($rank) = SQL_FETCHROW($result);
@@ -102,17 +100,16 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type) {
 
        // Add points to his account directly
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET turbo_bonus=turbo_bonus+".$points." WHERE userid=%s LIMIT 1",
-               array(bigintval($uid)), __FILE__, __LINE__);
+               array(bigintval($uid)), __FUNCTION__, __LINE__);
 
        // Rember this whole data for displaying ranking list
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus_turbo` (userid, mail_id, bonus_id, level, points, timemark) VALUES ('%s', '%s', '%s', '%s', '%s', UNIX_TIMESTAMP())",
-               array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FILE__, __LINE__);
+               array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FUNCTION__, __LINE__);
 
        if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD") && ($points > 0)) BONUS_POINTS_HANDLER($points);
 }
 //
 function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
-       global $_CONFIG;
        $self = false; $OUT = "";
 
        // How many ranks do we have?
@@ -120,7 +117,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 
        // Load current user's data
        $result = SQL_QUERY_ESC("SELECT level, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND userid=%s LIMIT 1",
-               array($type, $data, $uid), __FILE__, __LINE__);
+               array($type, $data, $uid), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                list($rank, $points, $mark) = SQL_FETCHROW($result);
@@ -139,7 +136,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 
        // Load rankings
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s ORDER BY level LIMIT %s",
-               array($type, $data, getConfig('bonus_lines')), __FILE__, __LINE__);
+               array($type, $data, getConfig('bonus_lines')), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start generating the ranking list
                $max = SQL_NUMROWS($result);
@@ -148,7 +145,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
                for ($rank = 1; $rank <= $max; $rank++) {
                        // Load data
                        $result_users = SQL_QUERY_ESC("SELECT userid, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND level=%s LIMIT 1",
-                               array($type, $data, $rank), __FILE__, __LINE__);
+                               array($type, $data, $rank), __FUNCTION__, __LINE__);
 
                        // Nothing found by default
                        $userid = "---"; $points = "---";
@@ -188,10 +185,8 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 }
 //
 function BONUS_POINTS_HANDLER ($MODE) {
-       global $_CONFIG;
-
        // Shall we add bonus points?
-       if (getConfig('bonus_active') == "N") return;
+       if (getConfig('bonus_active') != "Y") return;
 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
        if ((getConfig('bonus_mode') == "UID") && (getConfig('bonus_uid') == "0")) {
@@ -234,13 +229,11 @@ function BONUS_POINTS_HANDLER ($MODE) {
                break;
        }
 }
-//
-function BONUS_PURGE_EXPIRED_TURBO_BONUS()
-{
-       global $_CONFIG;
 
+//
+function BONUS_PURGE_EXPIRED_TURBO_BONUS() {
        // Remove entries
-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FUNCTION__, __LINE__);
        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
                SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TURBO_SUBJECT, "admin_autopurge_turbo", SQL_AFFECTEDROWS(), "");