www is out-dated

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 81069f6f7c66a71fbc19ead4203d61227ced10e5..15d6e28af0f68456bb3aea78c3de9617d2428f4b 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -63,8 +63,8 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestParameter('DOUBLER_USERID');
-unsetPostRequestParameter('DOUBLER_USERID');
+unsetGetRequestElement('DOUBLER_USERID');
+unsetPostRequestElement('DOUBLER_USERID');
 setSession('DOUBLER_USERID', '');
 if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
@@ -155,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