X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=f3dae48c9970474a21f9b5d54b8f503ec8bf00dd;hb=2e468b3c7df35a8e5f57c82e94aea3ce481de099;hp=38bc8c3772e00210125b0260969ff9e9fcdbcb4d;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 38bc8c3772..f3dae48c99 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 *
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isBegRallyeEnabled()) {
 	// Shall I withdraw now?
@@ -50,18 +50,21 @@ 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
-	$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
@@ -75,63 +78,62 @@ ORDER BY
 
 	if (!SQL_HASZERONUMS($result)) {
 		// List users
-		$OUT = ''; $cnt = 1; $total = '0';
+		$OUT = ''; $count = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Init variables
 			$WIN1 = ''; $WIN2 = '';
 
 			// Maybe he can win his active beg?
-			if ($cnt <= getConfig('beg_ranks')) {
+			if ($count <= getBegRanks()) {
 				// Mark him
 				$WIN1 = '<strong>';
 				$WIN2 = '</strong>';
 			} // 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'         => $cnt,
+				'count'       => $count,
 			);
 
 			// Load template and add it
-			$OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-			$cnt++; $total += $content['beg_points'];
+			$OUT .= loadTemplate('admin_list_beg_rows', true, $row);
+			$count++;
+			$total += $content['beg_points'];
 		} // END - while
 
 		$content['rows']  = $OUT;
-		$content['total'] = translateComma($total);
+		$content['total_points'] = $total;
 
 		// Check if we need to display form or not with manuel withdraw
-		if (getConfig('last_month') == getMonth()) {
+		if (getLastMonth() == getMonth()) {
 			// Load form
 			$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]