X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=afd5af2f32b7f0fc169bcb3c35f46b862fd8cc79;hp=5960bd49a694a7798d759f3abfb9539b38735b32;hb=af7e2ca186ae88d343f90bcb753645ab4847f227;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 5960bd49a6..afd5af2f32 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ===============                              Last change: 11/19/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/19/2003 *
+ * ===================                          Last change: 11/19/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-bonus.php                                   *
@@ -14,10 +14,9 @@
  * $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 - 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 *
@@ -44,14 +43,14 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bonus')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
 	return;
 } // END - if
 
-if (getExtensionVersion('bonus') >= '0.6.9') {
+if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
 	// Add more bonus points here
 	// @TODO Rewrite this to a filter
 	$USE = '(0';
@@ -66,52 +65,50 @@ if (getExtensionVersion('bonus') >= '0.6.9') {
 	$USE = '`turbo_bonus`';
 }
 
+// Init variables
+$lastOnline = '%s';
+$ONLINE = '';
+
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = '';
-if (isExtensionActive('autopurge')) {
+if ((isExtensionActive('autopurge')) && ((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'...
 $result = SQL_QUERY_ESC("SELECT
-	`userid`, ".$USE." AS points, `last_online`
+	`userid`, ".$USE." AS `points`, `last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
+	" . $USE . " > 0 AND
+	`status`='CONFIRMED'
+	" . $lastOnline . "
 ORDER BY
 	`points` DESC,
 	last_online DESC,
 	userid ASC
-LIMIT %s",
+LIMIT {?bonus_ranks?}",
 	array(
-		$ONLINE,
-		getConfig('bonus_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['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_bonus_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_bonus_404', true);