Fix and rewritten to expression language

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index d068ffd4cbae7320b54752a1bec8b5330797514d..6d1d88d258115dad7931a30c8fdb95c6e9204e8d 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -75,14 +75,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 +96,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?