Referal system refactured (and some parts fixed), wrapper function introduced:

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 03da51b034ff205c9b59c53a39f18de4687f313a..7fa1ae34a1a4aecc22c955ab843c85e8796b22d7 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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,7 @@ 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']);
+                               addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
                        } // END - if
 
                        // Set entry as "payed"