Large code cleanups:

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index b7ac0e243e534843b9ad0f3f5cb09cc0e975a616..7ec3e1eb8d000b1f724b9870a3c9a7155893d891 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';
 
@@ -124,26 +124,28 @@ if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')
                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $content['points']) {
                        // Check for his ref points
-                       $ref = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'");
+                       $refPoints = countSumTotalData($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'");
 
                        // Zero refid when empty (might be helpful!)
-                       if (empty($ref)) $ref = '0';
+                       if (empty($refPoints)) {
+                               $refPoints = '0';
+                       } // END - if
 
-                       if (($ref > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($ref))) {
-                               // Referal points found so add them and set line(s) to completed='Y'
-                               $content['points'] += $ref;
+                       if (($refPoints > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($refPoints))) {
+                               // Referral points found so add them and set line(s) to completed='Y'
+                               $content['points'] += $refPoints;
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
                                        array(bigintval($content['userid'])), __FILE__, __LINE__);
                        } else {
-                               // No referal points found
-                               $ref = '0';
+                               // No referral points found
+                               $refPoints = '0';
                        }
 
                        // Exclude webmaster from doubling...
                        if ($content['userid'] != getConfig('doubler_userid')) {
                                // Add points
-                               initReferalSystem();
-                               addPointsThroughReferalSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
+                               initReferralSystem();
+                               addPointsThroughReferralSystem(sprintf("doubler_%s", strtolower(getConfig('doubler_send_mode'))), $content['userid'], $content['points']);
                        } // END - if
 
                        // Set entry as "payed"