X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=459ea16c3bb665db23eccef1eea5cacb46a0e7a8;hb=c6017cf76200e2a5e68bd1984fa2d31f0e3be9d8;hp=deed93b238e0e17827c79d661468345fd71df32f;hpb=22ba710434fb8b31e8961976ee4a31ae28b4509d;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index deed93b238..459ea16c3b 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,14 +50,16 @@ if (isBegRallyeEnabled()) {
 		$curr = getMonth() - 1;
 		if (strlen($curr) == 1) $curr = '0' . $curr;
 		updateConfiguration('last_month', $curr);
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_WITHDRAW_PREPARED--}');
+		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
@@ -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()) {
@@ -113,25 +115,25 @@ ORDER BY
 			$content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
 		} else {
 			// Display message "no manual withdraw possible"
-			$content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_BEG_ALREADY_WITHDRAW--}');
+			$content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', true);
 		}
 
 		// Prepare constant for timemark
 		if (isExtensionActive('autopurge')) {
 			$content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
 		} else {
-			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, generateExtensionInactiveNotInstalledMessage('autopurge'));
+			$content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', true);
 		}
 
 		// Load final template
 		loadTemplate('admin_list_beg', false, $content);
 	} else {
 		// No one has joined the begging rallye...
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_NO_RALLYE--}');
+		displayMessage('{--ADMIN_BEG_NO_RALLYE--}');
 	}
 } else {
 	// Rallye deactivated
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
+	displayMessage('{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]