More code parts could take advantage of previously improved fixEmptyContentToDashes():

[mailer.git] / inc / modules / guest / what-top10.php

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index de8eef86e4774110befe53510d966ee8bb75194a..139f7f248ad6dc87ea6d8ed9ff0449c6a222cbba 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.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 *
@@ -43,17 +41,17 @@ if (!defined('__SECURITY')) {
 } // 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(generateExtensionInactiveNotInstalledMessage('top10'));
        return;
 } // END - if
 
 // Init array
 $rows = array();
 
-//// TOP logins
+// TOP logins
 $result = SQL_QUERY("SELECT
        `userid`, `total_logins`, `last_online`
 FROM
@@ -65,44 +63,35 @@ 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,
+               'cnt'          => $count,
                'userid'       => $content['userid'],
                'nickname'     => $content['nickname'],
                'total_logins' => $content['total_logins'],
-               'points'       => (countSumTotalData($content['userid'], 'user_points', 'points')),
+               'points'       => getTotalPoints($content['userid']),
                'last_online'  => generateDateTime($content['last_online'], 3),
        );
 
        // Load row template
        $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 < getConfig('top10_max')) {
        // Add more "blank" rows
-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+       for ($i = $count; $i <= getConfig('top10_max'); $i++) {
                // Prepare data for template
                $content = array(
-                       'sw'    => $SW,
                        'index' => $i
                );
 
                // Load row template
                $OUT .= loadTemplate('guest_top10_empty5', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 } // END - if
 
@@ -112,10 +101,10 @@ $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,
+       (SUM(p.points) - d.used_points) AS `points`,
        d.last_online
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
@@ -133,18 +122,11 @@ ORDER BY
        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,
+               'cnt'         => $count,
                'userid'      => $content['userid'],
                'nickname'    => $content['nickname'],
                'points'      => $content['points'],
@@ -154,22 +136,20 @@ while ($content = SQL_FETCHARRAY($result)) {
        // Load row template
        $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 < getConfig('top10_max')) {
        // Add more "blank" rows
-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+       for ($i = $count; $i <= getConfig('top10_max'); $i++) {
                // Prepare data for template
                $content = array(
-                       'sw'    => $SW,
                        'index' => $i
                );
 
                // Load row template
                $OUT .= loadTemplate('guest_top10_empty4', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 } // END - if
 
@@ -179,7 +159,7 @@ $rows['points_out'] = $OUT;
 // Free result
 SQL_FREERESULT($result);
 
-//// TOP referal "hunter"
+// TOP referal "hunter"
 $result = SQL_QUERY("SELECT
        d.userid,
        SUM(r.counter) AS refs,
@@ -200,44 +180,34 @@ ORDER BY
        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,
+               'cnt'         => $count,
                'userid'      => $content['userid'],
                'refs'        => $content['refs'],
                'nickname'    => $content['nickname'],
-               'points'      => (countSumTotalData($content['userid'], 'user_points', 'points')),
                'last_online' => generateDateTime($content['last_online'], 3)
        );
 
        // Load row template
        $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 < getConfig('top10_max')) {
        // Add more "blank" rows
-       for ($i = $cnt; $i <= getConfig('top10_max'); $i++) {
+       for ($i = $count; $i <= getConfig('top10_max'); $i++) {
                // Prepare data for template
                $content = array(
-                       'sw'    => $SW,
                        'index' => $i
                );
 
                // Load row template
                $OUT .= loadTemplate('guest_top10_empty5', true, $content);
-               $SW = 3 - $SW;
        } // END - for
 } // END - if