Possible fix for non-working nickname referal link

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

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 4c99ef6a3e51e920c5d6cd653d6701252fd6f78f..17f35434e704e6aec4e6cb9c7b85e75489d71bac 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -47,7 +47,7 @@ function addTurboBonus ($mid, $userid, $type) {
        if (getConfig('bonus_active') != 'Y') return false;
 
        // Init variables
-       $sql = ''; $bonus = 0; $mail = 0; $column = '';
+       $sql = ''; $bonus = '0'; $mail = '0'; $column = '';
 
        // Select SQL command
        switch ($type) {
@@ -93,7 +93,10 @@ function addTurboBonus ($mid, $userid, $type) {
 
        // Add points to his account directly
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `turbo_bonus`=`turbo_bonus`+%s WHERE `userid`=%s LIMIT 1",
-               array(bigintval($userid), $points), __FUNCTION__, __LINE__);
+               array(
+                       bigintval($userid),
+                       $points
+               ), __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())",
@@ -121,7 +124,13 @@ function addBonusRanks ($data, $type, $userid) {
 
        // 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, $userid), __FUNCTION__, __LINE__);
+               array(
+                       $type,
+                       $data,
+                       $userid
+               ), __FUNCTION__, __LINE__);
+
+       // Entry found?
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                $GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
@@ -139,8 +148,8 @@ function addBonusRanks ($data, $type, $userid) {
        } // END - if
 
        // Load rankings
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE %s=%s ORDER BY `level` ASC LIMIT %s",
-               array($type, $data, getConfig('bonus_lines')), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE %s=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
+               array($type, $data), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start generating the ranking list
                $max = SQL_NUMROWS($result);
@@ -225,7 +234,7 @@ function handleBonusPoints ($mode) {
        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_userid') == 0) && (isExtensionActive('jackpot'))) {
+       if ((getConfig('bonus_mode') == 'UID') && (getConfig('bonus_userid') == '0') && (isExtensionActive('jackpot'))) {
                // Update database & config
                updateConfiguration('bonus_mode', 'JACKPOT');
        } // END - if
@@ -238,22 +247,21 @@ function handleBonusPoints ($mode) {
                $points = $mode;
        }
 
+       // Check his amount first
+       $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
+
        // Subtract points from...
        switch (getConfig('bonus_mode')) {
                case 'JACKPOT': // ... jackpot
                        if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (getConfig('bonus_userid') > 0)) {
-                               // Check points amount first...
-                               $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
                                if ($total >= $points) {
                                        // Subtract points from userid's account
-                                       subtractPoints('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
+                                       subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
                                } // END - if
                        } // END - if
                        break;
 
                case 'UID': // ... userid's account
-                       // Check his amount first
-                       $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
                        if ($total >= $points) {
                                // Subtract points from userid's account
                                subtractPoints('bonus_payout_userid', getConfig('bonus_userid'), $points);
@@ -262,7 +270,7 @@ function handleBonusPoints ($mode) {
                                $dummy = subtractPointsFromJackpot($points);
                        }
                        break;
-       }
+       } // END - switch
 }
 
 // Purges expired fast-click bonus entries
@@ -276,5 +284,5 @@ function purgeExpiredTurboBonus() {
        } // END - if
 }
 
-//
+// [EOF]
 ?>