A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / mails / doubler_mails.php

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 038086d56697f6ac33a21452650890435336e7bd..b7ac0e243e534843b9ad0f3f5cb09cc0e975a616 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -142,7 +142,8 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                        // Exclude webmaster from doubling...
                        if ($content['userid'] != getConfig('doubler_userid')) {
                                // Add points
-                               addPointsDirectly(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
+                               initReferalSystem();
+                               addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
                        } // END - if
 
                        // Set entry as "payed"
@@ -154,20 +155,14 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                        // Check for jackpot inclusion in doubling process
                        if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
                                // Subtract points from jackpot
-                               subtractPointsFromJackpot($content['points']);
+                               $okay = subtractPointsFromJackpot($content['points']);
                                $jackpotPoints -= $content['points'];
-
-                               // Okay, done!
-                               $okay = true;
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account
                        if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
-                               // Add points to used points
-                               subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
-
-                               // Okay, done!
-                               $okay = true;
+                               // Subtract points
+                               $okay = subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
                        } // END - if
 
                        // Update doubler's account only when others are not updated