X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-top10.php;h=53cdedca70b9ec9c4d23c486fcafb5b88b93cb98;hb=da5c63bacddced77a951cbe7b223f314885a6c87;hp=de8eef86e4774110befe53510d966ee8bb75194a;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5;p=mailer.git

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index de8eef86e4..53cdedca70 100644
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.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 - 2013 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,70 +37,60 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('top10')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('top10'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=top10%}');
 	return;
 } // END - if
 
 // Init array
 $rows = array();
 
-//// TOP logins
+// TOP logins
 $result = SQL_QUERY("SELECT
-	`userid`, `total_logins`, `last_online`
+	`userid`,
+	`last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`total_logins` > 0 AND
 	`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . "
 ORDER BY
 	`total_logins` DESC
 LIMIT {?top10_max?}", __FILE__, __LINE__);
 
-$OUT = ''; $SW = 2; $cnt = 1;
+$OUT = ''; $count = 1;
 while ($content = SQL_FETCHARRAY($result)) {
-	// Init nickname
-	$content['nickname'] = '';
-
-	// Get nickname
-	if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
-
 	// Prepare data for template
 	$content = array(
-		'sw'           => $SW,
-		'cnt'          => $cnt,
+		'count'        => $count,
 		'userid'       => $content['userid'],
-		'nickname'     => $content['nickname'],
-		'total_logins' => $content['total_logins'],
-		'points'       => (countSumTotalData($content['userid'], 'user_points', 'points')),
-		'last_online'  => generateDateTime($content['last_online'], 3),
+		'last_online'  => generateDateTime($content['last_online'], '3'),
 	);
 
 	// Load row template
-	$OUT .= loadTemplate('guest_top10_row_login', true, $content);
+	$OUT .= loadTemplate('guest_top10_row_login', TRUE, $content);
 
-	// Switch colors and count one up
-	$SW = 3 - $SW; $cnt++;
+	// Count one up
+	$count++;
 } // END - while
 
-if ($cnt < getConfig('top10_max')) {
+if ($count < getTop10Max()) {
 	// Add more "blank" rows
-	for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+	for ($i = $count; $i <= getTop10Max(); $i++) {
 		// Prepare data for template
 		$content = array(
-			'sw'    => $SW,
 			'index' => $i
 		);
 
 		// Load row template
-		$OUT .= loadTemplate('guest_top10_empty5', true, $content);
-		$SW = 3 - $SW;
+		$OUT .= loadTemplate('guest_top10_empty5', TRUE, $content);
 	} // END - for
 } // END - if
 
@@ -112,64 +100,51 @@ $rows['logins_out'] = $OUT;
 // Free result
 SQL_FREERESULT($result);
 
-//// TOP earners
+// TOP earners
 $result = SQL_QUERY("SELECT
-	d.userid,
-	(SUM(p.points) - d.used_points) AS points,
-	d.last_online
+	`d`.`userid`,
+	SUM(`p`.`points` + `p`.`locked_points`) AS `points`,
+	`d`.`last_online`
 FROM
-	`{?_MYSQL_PREFIX?}_user_data` AS d
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 LEFT JOIN
-	{?_MYSQL_PREFIX?}_user_points AS p
+	{?_MYSQL_PREFIX?}_user_points AS `p`
 ON
-	p.userid=d.userid
+	`p`.`userid`=`d`.`userid`
 WHERE
-	p.points > 0 AND
-	d.`status`='CONFIRMED'
+	`p`.`points` > 0 AND
+	`d`.`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . "
 GROUP BY
-	p.userid
+	`p`.`userid`
 ORDER BY
-	points DESC,
-	d.last_online DESC
+	`points` DESC,
+	`d`.`last_online` DESC
 LIMIT {?top10_max?}", __FILE__, __LINE__);
 
-$OUT = ''; $SW = 2; $cnt = 1;
+$OUT = ''; $count = 1;
 while ($content = SQL_FETCHARRAY($result)) {
-	// Init nickname
-	$content['nickname'] = '';
-
-	// Get nickname
-	if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
-
 	// Prepare data for template
-	$content = array(
-		'sw'          => $SW,
-		'cnt'         => $cnt,
-		'userid'      => $content['userid'],
-		'nickname'    => $content['nickname'],
-		'points'      => $content['points'],
-		'last_online' => generateDateTime($content['last_online'], 3)
-	);
+	$content['count']       = $count;
+	$content['last_online'] = generateDateTime($content['last_online'], '3');
 
 	// Load row template
-	$OUT .= loadTemplate('guest_top10_row_earner', true, $content);
+	$OUT .= loadTemplate('guest_top10_row_earner', TRUE, $content);
 
-	// Switch colors and count one up
-	$SW = 3 - $SW; $cnt++;
+	// Count one up
+	$count++;
 } // END - while
 
-if ($cnt < getConfig('top10_max')) {
+if ($count < getTop10Max()) {
 	// Add more "blank" rows
-	for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+	for ($i = $count; $i <= getTop10Max(); $i++) {
 		// Prepare data for template
 		$content = array(
-			'sw'    => $SW,
 			'index' => $i
 		);
 
 		// Load row template
-		$OUT .= loadTemplate('guest_top10_empty4', true, $content);
-		$SW = 3 - $SW;
+		$OUT .= loadTemplate('guest_top10_empty4', TRUE, $content);
 	} // END - for
 } // END - if
 
@@ -179,76 +154,66 @@ $rows['points_out'] = $OUT;
 // Free result
 SQL_FREERESULT($result);
 
-//// TOP referal "hunter"
+// TOP referral "hunter"
 $result = SQL_QUERY("SELECT
-	d.userid,
-	SUM(r.counter) AS refs,
-	d.last_online
+	`d`.`userid`,
+	SUM(`r`.`counter`) AS `refs`,
+	`d`.`last_online`
 FROM
-	`{?_MYSQL_PREFIX?}_user_data` AS d
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 LEFT JOIN
-	{?_MYSQL_PREFIX?}_refsystem AS r
+	{?_MYSQL_PREFIX?}_refsystem AS `r`
 ON
-	r.userid=d.userid
+	`r`.`userid`=`d`.`userid`
 WHERE
-	r.counter > 0 AND
-	d.`status`='CONFIRMED'
+	`r`.`counter` > 0 AND
+	`d`.`status`='CONFIRMED'
+	" . runFilterChain('user_exclusion_sql', ' ') . "
 GROUP BY
-	r.userid
+	`r`.`userid`
 ORDER BY
-	refs DESC,
-	d.last_online DESC
+	`refs` DESC,
+	`d`.`last_online` DESC
 LIMIT {?top10_max?}", __FILE__, __LINE__);
 
-$OUT = ''; $SW = 2; $cnt = 1;
+$OUT = ''; $count = 1;
 while ($content = SQL_FETCHARRAY($result)) {
-	// Init nickname
-	$content['nickname'] = '';
-
-	// Get nickname
-	if (isExtensionActive('nickname')) $content['nickname'] = getNickname($content['userid']);
-
 	// Prepare data for template
 	$content = array(
-		'sw'          => $SW,
-		'cnt'         => $cnt,
+		'count'       => $count,
 		'userid'      => $content['userid'],
 		'refs'        => $content['refs'],
-		'nickname'    => $content['nickname'],
-		'points'      => (countSumTotalData($content['userid'], 'user_points', 'points')),
-		'last_online' => generateDateTime($content['last_online'], 3)
+		'last_online' => generateDateTime($content['last_online'], '3')
 	);
 
 	// Load row template
-	$OUT .= loadTemplate('guest_top10_row_refs', true, $content);
+	$OUT .= loadTemplate('guest_top10_row_refs', TRUE, $content);
 
-	// Switch colors and count one up
-	$SW = 3 - $SW; $cnt++;
+	// Count one up
+	$count++;
 } // END - while
 
-if ($cnt < getConfig('top10_max')) {
+if ($count < getTop10Max()) {
 	// Add more "blank" rows
-	for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+	for ($i = $count; $i <= getTop10Max(); $i++) {
 		// Prepare data for template
 		$content = array(
-			'sw'    => $SW,
 			'index' => $i
 		);
 
 		// Load row template
-		$OUT .= loadTemplate('guest_top10_empty5', true, $content);
-		$SW = 3 - $SW;
+		$OUT .= loadTemplate('guest_top10_empty5', TRUE, $content);
 	} // END - for
 } // END - if
 
 // Remember the rows in array
-$rows['referals_out'] = $OUT;
+$rows['referrals_out'] = $OUT;
 
 // Free result
 SQL_FREERESULT($result);
 
 // Load final template
-loadTemplate('guest_top10', false, $rows);
+loadTemplate('guest_top10', FALSE, $rows);
 
 // [EOF]
 ?>