X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=21c07396ff0fbf373fc7ad7fe2dd828463f8d3c8;hb=c6017cf76200e2a5e68bd1984fa2d31f0e3be9d8;hp=6f88dcfa5dac98f8651cdd73b50497f543ce1d9c;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 6f88dcfa5d..21c07396ff 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -14,11 +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, 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 *
@@ -45,10 +43,10 @@ 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
 
@@ -67,16 +65,19 @@ if (isExtensionInstalledAndNewer('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() - {?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
@@ -96,21 +97,17 @@ LIMIT {?bonus_ranks?}",
 $OUT = '';
 if (!SQL_HASZERONUMS($result)) {
 	// Load our winners...
-	$cnt = 1;
+	$count = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
-		$content = array(
-			'cnt'         => $cnt,
-			'userid'      => $content['userid'],
-			'points'      => $content['points'],
-			'last_online' => generateDateTime($content['last_online'], 2)
-		);
+		$content['cnt']         = $count;
+		$content['last_online'] = generateDateTime($content['last_online'], 2);
 
 		// Load row template
 		$OUT .= loadTemplate('member_bonus_row', true, $content);
 
 		// Count one up
-		$cnt++;
+		$count++;
 	} // END - while
 } else {
 	// No one is interested in our "active rallye" ! :-(