X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-beg2.php;h=510ddcc45dcdf28c06b09acabdb2c0ca5cb91345;hb=8da353fa4bb729bb3299d247803c23833a52a327;hp=c13931a6cac0846dd018d0044fc2689ec721c861;hpb=7618bd22d09e9bddab2ca39308f6523c06dd1521;p=mailer.git

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index c13931a6ca..510ddcc45d 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,16 +37,16 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('beg'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
 	return;
 } // END - if
 
@@ -56,19 +54,22 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) {
 $lastOnline = '%s';
 $ONLINE = '';
 
-if (isExtensionActive('autopurge')) {
+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
 
-// Let's check if there are some points left we can 'pay'...
+// Let's check if there are some points left we can pay...
 $result = SQL_QUERY_ESC("SELECT
-	`userid`, `beg_points` AS points, `last_online`
+	`userid`,
+	`beg_points`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`beg_points` > 0 AND
 	`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . "
 	" . $lastOnline . "
 ORDER BY
 	`beg_points` DESC,
@@ -81,28 +82,23 @@ LIMIT {?beg_ranks?}",
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load our winners...
-	$SW = 2; $cnt = 1;
+	$count = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
-		$content = array(
-			'sw'          => $SW,
-			'cnt'         => $cnt,
-			'userid'      => $content['userid'],
-			'points'      => $content['points'],
-			'last_online' => generateDateTime($content['last_online'], 2),
-		);
+		$content['count']       = $count;
+		$content['last_online'] = generateDateTime($content['last_online'], '2');
 
 		// Load row template
-		$OUT .= loadTemplate('member_list_beg_row', true, $content);
+		$OUT .= loadTemplate('member_list_beg_row', TRUE, $content);
 
-		// Count one up and switch colors
-		$cnt++; $SW = 3 - $SW;
+		// Count one up
+		$count++;
 	} // END - while
 } else {
-	// No one is interested in our "active rallye" ! :-(
-	$OUT = loadTemplate('member_beg_404', true);
+	// No one is interested in our "begging rallye" ! :-(
+	$OUT = loadTemplate('member_beg_404', TRUE);
 }
 
 // Prepare content
@@ -112,7 +108,7 @@ $content['rows'] = $OUT;
 SQL_FREERESULT($result);
 
 // Load final template
-loadTemplate('member_list_beg', false, $content);
+loadTemplate('member_list_beg', FALSE, $content);
 
 // [EOF]
 ?>