X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-beg2.php;h=f6b2fb935992459b9eeadc0c0bfdbc89671cc748;hb=7b50f1945e168fcd2daa82898c3bb71d59bc653a;hp=b37ce184463f3864f713a15acaeed21b90e464ff;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index b37ce18446..f6b2fb9359 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2005 *
- * ===============                              Last change: 10/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
+ * ===================                          Last change: 10/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-beg2.php                                    *
@@ -14,11 +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                           *
- * 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 *
@@ -38,66 +37,67 @@
 
 // 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
 
 // Autopurge installed?
-$lastOnline = "%s";
+$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() - %s)";
-	$ONLINE = getConfig('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 beg, `last_online`
+	`userid`,
+	`beg_points`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
+	`beg_points` > 0 AND
+	`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . "
+	" . $lastOnline . "
 ORDER BY
-	`beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s",
+	`beg_points` DESC,
+	`last_online` DESC,
+	`userid` ASC
+LIMIT {?beg_ranks?}",
 	array(
-		$ONLINE,
-		getConfig('beg_ranks')
+		$ONLINE
 	), __FILE__, __LINE__);
 
 // 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'    => bigintval($content['userid']),
-			'points' => translateComma($content['beg']),
-			'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);
 
-		// 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" ! :-(
+	// No one is interested in our "begging rallye" ! :-(
 	$OUT = loadTemplate('member_beg_404', true);
 }
 
@@ -110,5 +110,5 @@ SQL_FREERESULT($result);
 // Load final template
 loadTemplate('member_list_beg', false, $content);
 
-//
+// [EOF]
 ?>