Rewrite for eval() command

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index b47c597070eb72a0fd8f95933cdbe32d4be82623..9101070df0ec572b15a1c66be8ceddf1b8e04a0f 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 *
@@ -58,8 +59,8 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestElement('DOUBLER_UID');
-unsetPostRequestElement('DOUBLER_UID');
+unsetGetRequestParameter('DOUBLER_UID');
+unsetPostRequestParameter('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
 if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
 
@@ -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?