Several fixes for extension handling

[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 996324f3fe6f59edb6a38a208f765fbca4cd57bd..705a45fa7a9ed06cfb355f5cefb2a0dd7fc088fb 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -32,19 +32,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "top10");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 //// TOP logins
 $ADD = "userid";
@@ -98,7 +95,7 @@ define('__TOP_LOGINS_ROWS', $OUT);
 //// TOP earners
 $result = SQL_QUERY_ESC("SELECT DISTINCT p.userid, d.".$ADD.", (SUM(p.points) - d.used_points) AS tpoints, d.last_online
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON p.userid=d.userid
 WHERE p.points > 0 AND d.status='CONFIRMED'
 GROUP BY p.userid
@@ -146,10 +143,10 @@ if ($cnt < $_CONFIG['top10_max'])
 }
 define('__TOP_POINTS_ROWS', $OUT);
 
-//// TOP referral "hunter"
+//// TOP referal "hunter"
 $result = SQL_QUERY_ESC("SELECT DISTINCT r.userid, d.".$ADD.", SUM(r.counter) AS refs, d.last_online
 FROM "._MYSQL_PREFIX."_refsystem AS r
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON r.userid=d.userid
 WHERE r.counter > 0 AND d.status='CONFIRMED'
 GROUP BY r.userid