Fixes for typos and cache problems

[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 404bf3f0c1fd93409cad1173563edd0a872f5da7..eb9e1dbb9364c81bbc73ba8fe3c2be2cd5b15e8d 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,35 +37,30 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Online stats are only working if extension ext-online is installed
-if (EXT_IS_ACTIVE('online')) {
+if (isExtensionActive('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));
+       $content['guests_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='N'");
+       $content['admins_online']  = countSumTotalData('N', 'online', 'id', 'is_admin', true, " AND `is_member`='Y'");
+       $content['members_online'] = countSumTotalData('N', 'online', 'id', 'is_admin', true);
 
        // Load template
-       LOAD_TEMPLATE('admin_mini_online');
+       loadTemplate('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
-               LOAD_TEMPLATE('admin_online_header');
-
                // List all online users
-               $SW = 2;
+               $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Fix empty action/what
                        if (empty($content['action'])) $content['action'] = '---';
@@ -74,7 +69,7 @@ if (EXT_IS_ACTIVE('online')) {
                        if ($content['is_admin'] == 'Y') {
                                // Is an administrator
                                $content['userid'] = getMessage('_IS_ADMIN');
-                       } elseif (($content['is_member'] == 'N') && ($content['is_admin'] == 'N')) {
+                       } elseif (($content['is_member'] != 'Y') && ($content['is_admin'] != 'Y')) {
                                // Is a guest
                                $content['userid'] = getMessage('_IS_GUEST');
                        } elseif ($content['userid'] > 0) {
@@ -88,32 +83,29 @@ if (EXT_IS_ACTIVE('online')) {
                                $content['refid'] = generateUserProfileLink($content['refid']);
                        } // END - if
 
-                       OUTPUT_HTML("<tr>
-  <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$content['id']."</td>
-  <td align=\"center\" width=\"15%\" class=\"switch_sw".$SW." bottom right\">".$content['userid']."</td>
-  <td align=\"center\" width=\"10%\" class=\"switch_sw".$SW." bottom right\">".$content['ip']."</td>
-  <td align=\"center\" width=\"5%\" class=\"switch_sw".$SW." bottom right\">".$content['refid']."</td>
-  <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\">".generateDateTime($content['timestamp'], '2')."</td>
-</tr>");
+                       // Add more content
+                       $content['sw'] = $SW;
+                       $content['timestamp'] = generateDateTime($content['timestamp'], '2');
+
+                       // Load row template and switch color
+                       $OUT .= loadTemplate('admin_list_online_row', true, $content);
                        $SW = 3 - $SW;
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
-               // @TODO Rewrite this constant
-               define('__FANCY_ONLINE_TIMEOUT', createFancyTime(getConfig('online_timeout')));
+               // Remember rows and fancy time in array
+               $content['rows']           = $OUT;
+               $content['online_timeout'] = createFancyTime(getConfig('online_timeout'));
 
                // Load footer template
-               LOAD_TEMPLATE('admin_online_footer');
+               loadTemplate('admin_list_online', false, $content);
        } // END - if
 } else {
        // Online statistics deactivated!
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ONLINE_STATISTICS_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, getMessage('ONLINE_STATISTICS_DEACTIVATED'));
 }
 
-//
+// [EOF]
 ?>