Removed unneccessary eval() command in overview-inc.php, internal TODO closed

[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 fe843213db647fe0712c00790e61580d30fa6c26..8cec95dbe0ae46df7dba126675562bbddef687f7 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "top10");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "top10");
        return;
 }
 
@@ -48,31 +48,33 @@ $result = SQL_QUERY_ESC("
 SELECT
        userid, total_logins, last_online
 FROM
-       "._MYSQL_PREFIX."_user_data
+       {!_MYSQL_PREFIX!}_user_data
 WHERE
        total_logins > 0 AND
-       status='CONFIRMED'
+       `status`='CONFIRMED'
 ORDER BY
        total_logins DESC
 LIMIT %s",
        array(getConfig('top10_max')), __FILE__, __LINE__);
 
 $OUT = ""; $SW = 2; $cnt = 1;
-while (list($uid, $logins, $last) = SQL_FETCHROW($result)) {
-       $nick2 = "---";
+while ($content = SQL_FETCHARRAY($result)) {
+       // Init nickname
+       $content['nickname'] = "---";
 
        // Get nickname
-       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);
+       if (EXT_IS_ACTIVE("nickname")) $content['nickname'] = NICKNAME_GET_NICK($content['userid']);
 
        // Prepare data for template
+       // @TODO Rewritings: uid->userid,nick->nickname,logins->total_logins in template
        $content = array(
                'sw'     => $SW,
                'cnt'    => $cnt,
-               'uid'    => $uid,
-               'nick'   => $nick2,
-               'logins' => $logins,
-               'points' => TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points")),
-               'last'   => MAKE_DATETIME($last, "3"),
+               'uid'    => $content['userid'],
+               'nick'   => $content['nickname'],
+               'logins' => $content['total_logins'],
+               'points' => TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "points")),
+               'last'   => MAKE_DATETIME($content['last_online'], "3"),
        );
 
        // Load row template
@@ -80,7 +82,7 @@ while (list($uid, $logins, $last) = SQL_FETCHROW($result)) {
 
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
-}
+} // END - while
 
 if ($cnt < getConfig('top10_max')) {
        // Add more "blank" rows
@@ -94,8 +96,10 @@ if ($cnt < getConfig('top10_max')) {
                // Load row template
                $OUT .= LOAD_TEMPLATE("guest_top10_empty5", true, $content);
                $SW = 3 - $SW;
-       }
-}
+       } // END - for
+} // END - if
+
+// @TODO Rewrite this constant
 define('__TOP_LOGINS_ROWS', $OUT);
 
 // Free result
@@ -108,14 +112,14 @@ SELECT DISTINCT
        (SUM(p.points) - d.used_points) AS tpoints,
        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
 WHERE
        p.points > 0 AND
-       d.status='CONFIRMED'
+       d.`status`='CONFIRMED'
 GROUP BY
        p.userid
 ORDER BY
@@ -125,20 +129,22 @@ LIMIT %s",
        array(getConfig('top10_max')), __FILE__, __LINE__);
 
 $OUT = ""; $SW = 2; $cnt = 1;
-while (list($uid, $points, $last) = SQL_FETCHROW($result)) {
-       $nick2 = "---";
+while ($content = SQL_FETCHARRAY($result)) {
+       // Init nickname
+       $content['nickname'] = "---";
 
        // Get nickname
-       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);
+       if (EXT_IS_ACTIVE("nickname")) $content['nickname'] = NICKNAME_GET_NICK($content['userid']);
 
        // Prepare data for template
+       // @TODO Rewritings: nick->nickname,uid->userid in template
        $content = array(
                'sw'     => $SW,
                'cnt'    => $cnt,
-               'uid'    => bigintval($uid),
-               'nick'   => $nick2,
-               'points' => TRANSLATE_COMMA($points),
-               'last'   => MAKE_DATETIME($last, "3")
+               'uid'    => $content['userid'],
+               'nick'   => $content['nickname'],
+               'points' => TRANSLATE_COMMA($content['points']),
+               'last'   => MAKE_DATETIME($content['last_online'], "3")
        );
 
        // Load row template
@@ -146,7 +152,7 @@ while (list($uid, $points, $last) = SQL_FETCHROW($result)) {
 
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
-}
+} // END - while
 
 if ($cnt < getConfig('top10_max')) {
        // Add more "blank" rows
@@ -160,8 +166,10 @@ if ($cnt < getConfig('top10_max')) {
                // Load row template
                $OUT .= LOAD_TEMPLATE("guest_top10_empty4", true, $content);
                $SW = 3 - $SW;
-       }
-}
+       } // END - for
+} // END - if
+
+// @TODO Rewrite this constant
 define('__TOP_POINTS_ROWS', $OUT);
 
 // Free result
@@ -174,14 +182,14 @@ SELECT DISTINCT
        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
 WHERE
        r.counter > 0 AND
-       d.status='CONFIRMED'
+       d.`status`='CONFIRMED'
 GROUP BY
        r.userid
 ORDER BY
@@ -191,21 +199,23 @@ LIMIT %s",
        array(getConfig('top10_max')), __FILE__, __LINE__);
 
 $OUT = ""; $SW = 2; $cnt = 1;
-while (list($uid, $refs, $last) = SQL_FETCHROW($result)) {
-       $nick2 = "---";
+while ($content = SQL_FETCHARRAY($result)) {
+       // Init nickname
+       $content['nickname'] = "---";
 
        // Get nickname
-       if (EXT_IS_ACTIVE("nickname")) $nick2 = NICKNAME_GET_NICK($uid);
+       if (EXT_IS_ACTIVE("nickname")) $content['nickname'] = NICKNAME_GET_NICK($content['userid']);
 
        // Prepare data for template
+       // @TODO Rewritings: nick->nickname,uid->userid in template
        $content = array(
                'sw'     => $SW,
                'cnt'    => $cnt,
-               'uid'    => bigintval($uid),
-               'refs'   => $refs,
-               'nick'   => $nick2,
-               'points' => TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points")),
-               'last'   => MAKE_DATETIME($last, "3")
+               'uid'    => $content['userid'],
+               'refs'   => $content['refs'],
+               'nick'   => $content['nickname'],
+               'points' => TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "points")),
+               'last'   => MAKE_DATETIME($content['last_online'], "3")
        );
 
        // Load row template
@@ -213,7 +223,7 @@ while (list($uid, $refs, $last) = SQL_FETCHROW($result)) {
 
        // Switch colors and count one up
        $SW = 3 - $SW; $cnt++;
-}
+} // END - while
 
 if ($cnt < getConfig('top10_max')) {
        // Add more "blank" rows
@@ -227,14 +237,17 @@ if ($cnt < getConfig('top10_max')) {
                // Load row template
                $OUT .= LOAD_TEMPLATE("guest_top10_empty5", true, $content);
                $SW = 3 - $SW;
-       }
-}
+       } // END - for
+} // END - if
+
+// @TODO Rewrite this constant
 define('__TOP_REFERRAL_ROWS', $OUT);
 
 // Free result
 SQL_FREERESULT($result);
 
 // Remember other values in constants
+// @TODO Rewrite this constant
 define('__TOP10_MAX', getConfig('top10_max'));
 
 // Load final template