mailer project continued:

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 7ec3e1eb8d000b1f724b9870a3c9a7155893d891..540584641090dede4f695433a0d62a6cea88f575 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -76,36 +76,42 @@ FROM
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS u
 ON
-       d.userid=u.userid
+       d.`userid`=u.`userid`
 WHERE
-       u.`status`='CONFIRMED' AND
-       d.points <= %s AND
-       d.points >= ({?doubler_min?} * 2) AND
-       d.completed='N' AND
-       d.is_ref='N'
+       u.`status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       d.`points` <= %s AND
+       d.`points` >= ({?doubler_min?} * 2) AND
+       d.`completed`='N' AND
+       d.`is_ref`='N'
 ORDER BY
-       d.timemark ASC",
+       d.`timemark` ASC",
        array(
                $DOUBLER_POINTS
        ), __FILE__, __LINE__);
 
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT
-       d.id, d.userid, d.points, d.remote_ip, d.timemark
+       d.`id`,
+       d.`userid`,
+       d.`points`,
+       d.`remote_ip`,
+       d.`timemark`
 FROM
        `{?_MYSQL_PREFIX?}_doubler` AS d
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS u
 ON
-       d.userid=u.userid
+       d.`userid`=u.`userid`
 WHERE
-       u.`status`='CONFIRMED' AND
-       d.points <= %s AND
-       d.points >= ({?doubler_min?} * 2) AND
-       d.completed='N' AND
-       d.is_ref='N'
+       u.`status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       d.`points` <= %s AND
+       d.`points` >= ({?doubler_min?} * 2) AND
+       d.`completed`='N' AND
+       d.`is_ref`='N'
 ORDER BY
-       d.timemark ASC
+       d.`timemark` ASC
 LIMIT {?doubler_max_sent?}",
        array(
                $DOUBLER_POINTS