X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=0ca6ad17229f2c8b55413086a8bf2ef7410c05db;hb=eefb72c90c4d30b82b9277acd42754dca014302b;hp=f349aee801b404d41e0e37f163f79f8c3e119c0e;hpb=4c221b6350439b8f91db58f142f03f79014f2eaf;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index f349aee801..0ca6ad1722 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isBegRallyeEnabled()) {
 	// Shall I withdraw now?
-	if (isPostRequestParameterSet('withdraw')) {
+	if (isPostRequestElementSet('withdraw')) {
 		// Okay, let's prepare...
 		$curr = getMonth() - 1;
 		if (strlen($curr) == 1) $curr = '0' . $curr;
@@ -53,15 +53,18 @@ 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`,`email`,`beg_points`,`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -88,24 +91,23 @@ ORDER BY
 			} // END - if
 
 			// Prepare content
-			$content = array(
+			$row = array(
 				'userid'      => $content['userid'],
 				'email'       => generateEmailLink($content['email'], 'user_data'),
-				'gender'      => $content['gender'],
-				'turbo'       => $content['beg_points'],
-				'last_online' => generateDateTime($content['last_online'], 2),
+				'last_online' => generateDateTime($content['last_online'], '2'),
 				'win1'        => $WIN1,
 				'win2'        => $WIN2,
-				'cnt'         => $count,
+				'count'       => $count,
 			);
 
 			// Load template and add it
-			$OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-			$count++; $total += $content['beg_points'];
+			$OUT .= loadTemplate('admin_list_beg_rows', true, $row);
+			$count++;
+			$total += $content['beg_points'];
 		} // 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