Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / inc / modules / admin / what-usr_online.php

diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index e5952f873a693de278fc8f52a45a9ab8ed87317c..d1a676b52ece97d80573d0864c9554b0eef007f9 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -32,21 +32,20 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 if (EXT_IS_ACTIVE("online", true))
 {
        // Count guests, members and admins
-       $result_guests  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
-       $result_members = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
-       $result_admins  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='Y'", __FILE__, __LINE__);
+       $result_guests  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
+       $result_members = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
+       $result_admins  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='Y'", __FILE__, __LINE__);
 
        // Remember values for the template
        define('_GUESTS_ONLINE' , SQL_NUMROWS($result_guests));
@@ -62,7 +61,7 @@ if (EXT_IS_ACTIVE("online", true))
        LOAD_TEMPLATE("admin_mini_online");
 
        // Check for online users
-       $result = SQL_QUERY("SELECT id, ip, userid, refid, module, action, what, is_member, is_admin, timestamp FROM "._MYSQL_PREFIX."_online ORDER by timestamp DESC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, ip, userid, refid, module, action, what, is_member, is_admin, timestamp FROM `{!_MYSQL_PREFIX!}_online` ORDER by timestamp DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {
                // Load header template
@@ -85,29 +84,29 @@ if (EXT_IS_ACTIVE("online", true))
                                // Is a guest
                                $uid = _IS_GUEST;
                        }
-                       OUTPUT_HTML ("<TR>
-  <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$id."</TD>
-  <TD align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">");
+                       OUTPUT_HTML("<tr>
+  <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$id."</td>
+  <td align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">");
                        if ($uid > 0)
                        {
-                               OUTPUT_HTML (ADMIN_USER_PROFILE_LINK($uid));
+                               OUTPUT_HTML(ADMIN_USER_PROFILE_LINK($uid));
                        }
                         else
                        {
-                               OUTPUT_HTML ($uid);
+                               OUTPUT_HTML($uid);
                        }
                        if ($ref > 0)
                        {
                                $ref = ADMIN_USER_PROFILE_LINK($ref);
                        }
-                       OUTPUT_HTML ("</TD>
-  <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$ip."</TD>
-  <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$ref."</TD>
-  <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$mod."</TD>
-  <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$act."</TD>
-  <TD align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$wht."</TD>
-  <TD align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom\">".MAKE_DATETIME($time, "2")."</TD>
-</TR>");
+                       OUTPUT_HTML("</td>
+  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$ip."</td>
+  <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$ref."</td>
+  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$mod."</td>
+  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$act."</td>
+  <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$wht."</td>
+  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom\">".MAKE_DATETIME($time, "2")."</td>
+</tr>");
                        $SW = 3 - $SW;
                }
 
@@ -115,7 +114,7 @@ if (EXT_IS_ACTIVE("online", true))
                SQL_FREERESULT($result);
 
                // Load footer template
-               define('__FANCY_ONLINE_TIMEOUT', CREATE_FANCY_TIME($CONFIG['online_timeout']));
+               define('__FANCY_ONLINE_TIMEOUT', CREATE_FANCY_TIME(getConfig('online_timeout')));
                LOAD_TEMPLATE("admin_online_footer");
        }
 }