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 cf13775287f68a436c826c6684958d0ca03143c5..0c8129d11d2f89124b69b5f526b192b2695a0ff6 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -50,7 +50,7 @@ if (isBonusRallyeActive()) {
                $curr = getMonth() - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
+               displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
        } // END - if
 
        if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
@@ -67,27 +67,28 @@ if (isBonusRallyeActive()) {
                $USE = '`turbo_bonus`';
        }
 
+       // Init variables
+       $lastOnline = '';
+
        // Autopurge installed?
-       $lastOnline = '%s'; $ONLINE = '';
-       if (isExtensionActive('autopurge')) {
+       if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
                // 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
-       $result = SQL_QUERY_ESC("SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online`
+       $result = SQL_QUERY("SELECT
+       `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,
-       `userid` ASC",
-               array($ONLINE), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result)) {
                // List users
@@ -131,7 +132,7 @@ ORDER BY
                // Prepare constant for timemark
                // @TODO Can't this be moved into our expression language?
                if (isExtensionActive('autopurge')) {
-                       $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
+                       $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
                } else {
                        $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
                }
@@ -140,11 +141,11 @@ ORDER BY
                loadTemplate('admin_list_bonus', false, $content);
        } else {
                // No one has become an "activity bonus"...
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
+               displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
        }
 } else {
        // Aktive-Rallye not activated
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
+       displayMessage('{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]