New naming convention applied to many functions, see #118 for details

[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 ffb7f8618cd3041d0c6067ce7ecc8657d601a659..b73b91080718a5a165f69218fc074bdb6ca57438 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -50,19 +50,19 @@ if (EXT_IS_ACTIVE('online')) {
        // Count guests, members and admins
        // @TODO Rewrite these constants
        // @TODO Add a filter for sponsor
-       define('_GUESTS_ONLINE' , GET_TOTAL_DATA("N", 'online', "id", "is_admin", true, " AND is_member='N'"));
-       define('_ADMINS_ONLINE' , GET_TOTAL_DATA("N", 'online', "id", "is_admin", true, " AND is_member='Y'"));
-       define('_MEMBERS_ONLINE', GET_TOTAL_DATA("N", 'online', "id", "is_admin", true));
+       define('_GUESTS_ONLINE' , GET_TOTAL_DATA('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'"));
+       define('_ADMINS_ONLINE' , GET_TOTAL_DATA('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'"));
+       define('_MEMBERS_ONLINE', GET_TOTAL_DATA('N', 'online', 'id', 'is_admin', true));
 
        // Load template
-       LOAD_TEMPLATE("admin_mini_online");
+       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__);
        if (SQL_NUMROWS($result) > 0) {
                // Load header template
-               LOAD_TEMPLATE("admin_online_header");
+               LOAD_TEMPLATE('admin_online_header');
 
                // List all online users
                $SW = 2;
@@ -79,13 +79,13 @@ if (EXT_IS_ACTIVE('online')) {
                                $content['userid'] = getMessage('_IS_GUEST');
                        } elseif ($content['userid'] > 0) {
                                // Add profile link to userid
-                               $content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
+                               $content['userid'] = generateUserProfileLink($content['userid']);
                        } // END - if
 
                        // Is the refid set?
                        if ($content['refid'] > 0) {
                                // Add profile link to referer id
-                               $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+                               $content['refid'] = generateUserProfileLink($content['refid']);
                        } // END - if
 
                        OUTPUT_HTML("<tr>
@@ -96,7 +96,7 @@ if (EXT_IS_ACTIVE('online')) {
   <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$content['module']."</td>
   <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$content['action']."</td>
   <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$content['what']."</td>
-  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom\">".MAKE_DATETIME($content['timestamp'], "2")."</td>
+  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom\">".generateDateTime($content['timestamp'], '2')."</td>
 </tr>");
                        $SW = 3 - $SW;
                } // END - while
@@ -105,10 +105,10 @@ if (EXT_IS_ACTIVE('online')) {
                SQL_FREERESULT($result);
 
                // @TODO Rewrite this constant
-               define('__FANCY_ONLINE_TIMEOUT', CREATE_FANCY_TIME(getConfig('online_timeout')));
+               define('__FANCY_ONLINE_TIMEOUT', createFancyTime(getConfig('online_timeout')));
 
                // Load footer template
-               LOAD_TEMPLATE("admin_online_footer");
+               LOAD_TEMPLATE('admin_online_footer');
        } // END - if
 } else {
        // Online statistics deactivated!