A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index f349aee801b404d41e0e37f163f79f8c3e119c0e..b8b5d4b9f4cbcb6b2d7d89754a7b55f9362a0479 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -53,15 +53,17 @@ if (isBegRallyeEnabled()) {
                displayMessage('{--ADMIN_BEG_WITHDRAW_PREPARED--}');
        } // END - if
 
-       // Autopurge installed?
+       // Init variable
        $lastOnline = '';
-       if (isExtensionActive('autopurge')) {
+
+       // Autopurge installed?
+       if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((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("SELECT `userid`, `gender`, `surname`, `family`, `email`, `beg_points`, `last_online`
+       $result = SQL_QUERY("SELECT `userid`,`gender`,`surname`,`family`,`email`,`beg_points`,`last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -96,7 +98,7 @@ ORDER BY
                                'last_online' => generateDateTime($content['last_online'], 2),
                                'win1'        => $WIN1,
                                'win2'        => $WIN2,
-                               'cnt'         => $count,
+                               'count'       => $count,
                        );
 
                        // Load template and add it
@@ -105,7 +107,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = $total;
+               $content['total_points'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
@@ -120,7 +122,7 @@ ORDER BY
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
-                       $content['autopurge_timeout'] = displayMessage(generateExtensionInactiveNotInstalledMessage('autopurge'), true);
+                       $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', true);
                }
 
                // Load final template