Refactured old lost code

[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 a9be0cc9d6d6a90bb1a89d7898c8269ad2d2255e..b398f9f035cb3fda7814c3318a18aae5d6956eb3 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Wer ist wo? (KEINE Untermenues anhaengen!)       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,32 +43,29 @@ 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);
+$total = GET_TOTAL_DATA("", "online", "id", "userid", true);
+
 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)),
+       'total'   => TRANSLATE_COMMA($total)
+);
 
 // Output table
-LOAD_TEMPLATE("online_now");
+LOAD_TEMPLATE("online_now", false, $content);
 
 // Add more links in this block
-RUN_FILTER('online_extra_links');
+runFilterChain('online_extra_links');
 
 //
 ?>