Extension ext-coupon continued, a lot improvements applied:

[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 f1749a980b3969e315dc05e00ec259ce824d63a3..0c8129d11d2f89124b69b5f526b192b2695a0ff6 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -67,27 +67,28 @@ if (isBonusRallyeActive()) {
                $USE = '`turbo_bonus`';
        }
 
                $USE = '`turbo_bonus`';
        }
 

+       // Init variables
+       $lastOnline = '';
+

        // Autopurge installed?
        // Autopurge installed?

-       $lastOnline = '%s'; $ONLINE = '';
-       if (isExtensionActive('autopurge')) {
+       if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {

                // Use last online timestamp to keep inactive members away from here
                // Use last online timestamp to keep inactive members away from here

-               $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
+               $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';

        } // END - if
 
        // Check if at least one is in the active rallye
        } // END - if
 
        // Check if at least one is in the active rallye

-       $result = SQL_QUERY_ESC("SELECT
+       $result = SQL_QUERY("SELECT

        `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS `points`, `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND
        `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS `points`, `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `status`='CONFIRMED' AND

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

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

-       `userid` ASC",
-               array($ONLINE), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);

 
        if (!SQL_HASZERONUMS($result)) {
                // List users
 
        if (!SQL_HASZERONUMS($result)) {
                // List users