Some global variables rewritten, a lot more language constants rewritten to getMessage()

[mailer.git] / inc / modules / guest / action-online.php

diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index 7745551966dee01dfad02f297a5bde64062aa3e7..3dd9737ab6c15ba8608c423d4937f50b21791d2f 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -43,29 +43,25 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("online")) && (!IS_ADMIN())) {
        // Just skip this extension
        return;
-} elseif (defined('GUESTS_ONLINE_CNT')) {
-       // Skip it if already executed
-       return;
 }
 
-$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__);
-
 // Total visitors online
 $total      = SQL_NUMROWS($result_guests) + SQL_NUMROWS($result_members) + SQL_NUMROWS($result_admins);
+
 if (getConfig('mad_count') < $total) {
        // Update counter
        UPDATE_CONFIG(array("mad_timestamp", "mad_count"), array(time(), $total));
 } // END - if
 
-// Put all values in constants for the template
-define('GUESTS_ONLINE_CNT' , SQL_NUMROWS($result_guests));
-define('MEMBERS_ONLINE_CNT', SQL_NUMROWS($result_members));
-define('ADMINS_ONLINE_CNT' , SQL_NUMROWS($result_admins));
+// Prepare content
+$content = array(
+       'guests'  => TRANSLATE_COMMA(GET_TOTAL_DATA("N", "online", "id", "is_admin", true, " AND is_member='N'")),
+       'members' => TRANSLATE_COMMA(GET_TOTAL_DATA("N", "online", "id", "is_admin", true, " AND is_member='Y'")),
+       'admins'  => TRANSLATE_COMMA(GET_TOTAL_DATA("Y", "online", "id", "is_admin", true))
+);
 
 // Output table
-LOAD_TEMPLATE("online_now");
+LOAD_TEMPLATE("online_now", false, $content);
 
 // Add more links in this block
 runFilterChain('online_extra_links');