Rewrites to use filters instead of mass if() blocks

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

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index befed20d39f3ca9c149ce41e8452636fc2067e68..448accb5f33ee1e7743e502b40217f085e799ffc 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -41,25 +41,28 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // This function must be run *BEFORE* a link is removed from table 'mailer_user_links' !
-function addTurboBonus ($mid, $userid, $type) {
+function addTurboBonus ($id, $userid, $type) {
        // Shall we add bonus points?
        if (!isBonusRallyeActive()) {
                return FALSE;
        } // END - if
 
        // Init variables
-       $sql = ''; $bonus = '0'; $mail = '0'; $column = '';
+       $sql     = '';
+       $bonusId = 'NULL';
+       $mailId  = 'NULL';
+       $column  = '';
 
        // Select SQL command
        switch ($type) {
                case 'bonusid':
                        $column = 'bonus_id';
-                       $bonus = $mid;
+                       $bonusId = $id;
                        break;
 
                case 'mailid' :
                        $column = 'mail_id';
-                       $mail = $mid;
+                       $mailId = $id;
                        break;
 
                default:
@@ -74,7 +77,7 @@ function addTurboBonus ($mid, $userid, $type) {
        } // END - if
 
        // Check for entry
-       $rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, TRUE) + 1;
+       $rank = countSumTotalData($id, 'bonus_turbo', 'id', $column, TRUE) + 1;
 
        // Which rank?
        if ($rank == 1) {
@@ -103,12 +106,13 @@ function addTurboBonus ($mid, $userid, $type) {
        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($userid),
-                       bigintval($mail),
-                       bigintval($bonus),
+                       $mailId,
+                       $bonusId,
                        $rank,
                        $points
                ), __FUNCTION__, __LINE__);
 
+       // @TODO Rewrite this to a filter
        if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
                handleBonusPoints($points, $userid);
        } // END - if
@@ -215,7 +219,7 @@ function handleBonusPoints ($mode, $userid) {
        $return = FALSE;
 
        // Switch to jackpot-mode when no UID is supplied but userid-mode is selected
-       if ((getBonusMode() == 'UID') && ($userid == '0') && (isExtensionActive('jackpot'))) {
+       if ((getBonusMode() == 'UID') && (!isValidId($userid)) && (isExtensionActive('jackpot'))) {
                // Update database & config
                updateConfiguration('bonus_mode', 'JACKPOT');
        } // END - if
@@ -238,7 +242,7 @@ function handleBonusPoints ($mode, $userid) {
                        break;
 
                case 'JACKPOT': // ... jackpot
-                       if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === FALSE) && (isValidUserId($userid))) {
+                       if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === FALSE) && (isValidId($userid))) {
                                if ($total >= $points) {
                                        // Subtract points from userid's account
                                        $return = subtractPointsFromJackpot('bonus_payout_jackpot', $userid, $points);
@@ -266,13 +270,13 @@ function handleBonusPoints ($mode, $userid) {
 }
 
 // Purges expired fast-click bonus entries
-function purgeExpiredTurboBonus() {
+function purgeExpiredTurboBonus () {
        // Remove entries
        $result = SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE (UNIX_TIMESTAMP() - `timemark`) >= {?bonus_timeout?}', __FUNCTION__, __LINE__);
 
        if (!SQL_HASZEROAFFECTED()) {
                // Send out email to admin
-               sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
+               sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_purge_turbo', SQL_AFFECTEDROWS());
        } // END - if
 }