Hotfix

[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 97505560e284de32a228503dd0d673c4f7761620..6610fa1ed16ec641ac06962cc88c4e943a304c73 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 - 2011 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 *
@@ -44,16 +44,16 @@ if (!defined('__SECURITY')) {
 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
@@ -65,20 +65,11 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 
 $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(
-               'cnt'          => $count,
+               'count'        => $count,
                'userid'       => $content['userid'],
-               'nickname'     => $content['nickname'],
-               'total_logins' => $content['total_logins'],
-               'points'       => getTotalPoints($content['userid']),
-               'last_online'  => generateDateTime($content['last_online'], 3),
+               'last_online'  => generateDateTime($content['last_online'], '3'),
        );
 
        // Load row template
@@ -107,10 +98,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
@@ -130,20 +121,9 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 
 $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(
-               'cnt'         => $count,
-               '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);
@@ -171,7 +151,7 @@ $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,
@@ -194,20 +174,12 @@ LIMIT {?top10_max?}", __FILE__, __LINE__);
 
 $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(
-               'cnt'         => $count,
+               'count'       => $count,
                'userid'      => $content['userid'],
                'refs'        => $content['refs'],
-               'nickname'    => $content['nickname'],
-               'points'      => getTotalPoints($content['userid']),
-               'last_online' => generateDateTime($content['last_online'], 3)
+               'last_online' => generateDateTime($content['last_online'], '3')
        );
 
        // Load row template
@@ -231,7 +203,7 @@ if ($count < getConfig('top10_max')) {
 } // END - if
 
 // Remember the rows in array
-$rows['referals_out'] = $OUT;
+$rows['referrals_out'] = $OUT;
 
 // Free result
 SQL_FREERESULT($result);