mailer project continued:

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 7b3524d3cdba3dfb0b3a7374b6c47be13cccc593..068106e5d4b15cf1e4f882bb047917ff92c2a501 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * $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 *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *


@@ -54,7 +54,7 @@ if (isBonusRallyeActive()) {
        } // END - if
 
        // Old version ???
        } // END - if
 
        // Old version ???

-       $USE = '`turbo_bonus`';
+       $pointsColumns = '`turbo_bonus`';

 
        // Run filter chain to find more columns
        $add = runFilterChain('add_bonus_points_user_columns', '');
 
        // Run filter chain to find more columns
        $add = runFilterChain('add_bonus_points_user_columns', '');


@@ -62,7 +62,7 @@ if (isBonusRallyeActive()) {
        // Add them, if some where configured
        if (!empty($add)) {
                // Add more bonus points here
        // Add them, if some where configured
        if (!empty($add)) {
                // Add more bonus points here

-               $USE = '(0' . $add . ')';
+               $pointsColumns = '(0' . $add . ')';

        } // END - if
 
        // Init variables
        } // END - if
 
        // Init variables


@@ -78,14 +78,15 @@ if (isBonusRallyeActive()) {
        $result = SQL_QUERY("SELECT
        `userid`,
        `email`,
        $result = SQL_QUERY("SELECT
        `userid`,
        `email`,

-       " . $USE . " AS `points`,
+       " . $pointsColumns . " AS `points`,

        `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND
        `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND

-       " . $USE . " > 0
+       " . $pointsColumns . " > 0

        " . $lastOnline . "
        " . $lastOnline . "

+       " . runFilterChain('user_exclusion_sql', ' ') . "

 ORDER BY
        `points` DESC,
        `last_online` DESC,
 ORDER BY
        `points` DESC,
        `last_online` DESC,