Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index d068ffd4cbae7320b54752a1bec8b5330797514d..a26123480ed695eff3aed8643817a87948e9441f 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,11 +48,11 @@ if (!defined('__SECURITY')) {
 if (getOutputMode() != 0) return;
 
 // Initialize variables
-$jackpot = '0'; $user = '0';
-if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
+$jackpotPoints = '0'; $userPoints = '0';
+if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
 
 // Get total points of the doubler itself
-$DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
+$DOUBLER_POINTS = getDoublerTotalPointsLeft();
 if ($DOUBLER_POINTS == '0') {
        // Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
        return;
@@ -75,14 +76,13 @@ ON
 WHERE
        u.`status`='CONFIRMED' AND
        d.points <= %s AND
-       d.points >= %s AND
+       d.points >= ({?doubler_min?} * 2) AND
        d.completed='N' AND
        d.is_ref='N'
 ORDER BY
        d.timemark ASC",
        array(
-               $DOUBLER_POINTS,
-               getConfig(('doubler_min') * 2)
+               $DOUBLER_POINTS
        ), __FILE__, __LINE__);
 
 // Check for accounts with limitation
@@ -97,16 +97,14 @@ ON
 WHERE
        u.`status`='CONFIRMED' AND
        d.points <= %s AND
-       d.points >= %s AND
+       d.points >= ({?doubler_min?} * 2) AND
        d.completed='N' AND
        d.is_ref='N'
 ORDER BY
        d.timemark ASC
-LIMIT %d",
+LIMIT {?doubler_max_sent?}",
        array(
-               $DOUBLER_POINTS,
-               getConfig(('doubler_min') * 2),
-               getConfig('doubler_max_sent')
+               $DOUBLER_POINTS
        ), __FILE__, __LINE__);
 
 // Do we have entries found?
@@ -148,17 +146,17 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        $okay = false;
 
                        // Check for jackpot inclusion in doubling process
-                       if (($jackpot > 0) && ($jackpot >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
+                       if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
                                // Subtract points from jackpot
                                subtractPointsFromJackpot($content['points']);
-                               $jackpot -= $content['points'];
+                               $jackpotPoints -= $content['points'];
 
                                // Okay, done!
                                $okay = true;
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account
-                       if (($user > 0) && ($user >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
+                       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']);
 
@@ -179,13 +177,13 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        // Prepare array
                        $content = array(
                                // Doubler transmission id
-                               'id'     => $content['id'],
+                               'id'        => $content['id'],
                                // Doubled points
-                               'points' => translateComma($content['points']),
+                               'points'    => $content['points'],
                                // Timemark
-                               'when'   => generateDateTime($content['timemark'], 2),
+                               'timemark'  => generateDateTime($content['timemark'], 2),
                                // IP number when the member submitted the doubling form
-                               'ip'     => $content['remote_ip'],
+                               'remote_ip' => $content['remote_ip'],
                        );
 
                        // Load mail template and send mail away...