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 e914caadfa46ef9e48264897fdffee03535b2a9c..b7ac0e243e534843b9ad0f3f5cb09cc0e975a616 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -39,15 +39,21 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('doubler')) {
+       // Do not execute when extension is absent
+       return;
+} elseif (!isHtmlOutputMode()) {
+       // Do not execute when script is in CSS mode
        return;
 }
 
-// Do not execute when script is in CSS mode
-if (!isHtmlOutputMode()) return;
-
 // Initialize variables
-$jackpotPoints = '0'; $userPoints = '0';
-if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
+$jackpotPoints = '0';
+$userPoints = '0';
+
+// @TODO Can this be rewritten to a filter?
+if (isExtensionActive('jackpot')) {
+       $jackpotPoints = getJackpotPoints();
+} // END - if
 
 // Get total points of the doubler itself
 $DOUBLER_POINTS = getDoublerTotalPointsLeft();
@@ -57,9 +63,9 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestParameter('DOUBLER_UID');
-unsetPostRequestParameter('DOUBLER_UID');
-setSession('DOUBLER_UID', '');
+unsetGetRequestParameter('DOUBLER_USERID');
+unsetPostRequestParameter('DOUBLER_USERID');
+setSession('DOUBLER_USERID', '');
 if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
 // Check for doubles which we can pay out
@@ -136,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"
@@ -148,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