More improved SQL queries

[mailer.git] / inc / modules / guest / what-active.php

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index 2d701c2ddcdc6ea37054cf5455f39d0a06aa8caf..6221433fef60c5551a0ec103d062c338a67f92ac 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -35,33 +35,32 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif (!EXT_IS_ACTIVE("active"))
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "active");
+} elseif ((!EXT_IS_ACTIVE("active")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "active");
        return;
 }
 
 // Add description as navigation point
 ADD_DESCR("guest", __FILE__);
 
-// The day normally starts on 00:00:00, so let's subtract current hours/minutes/seconds from current time stamp!
-$START = time() - date("H", time())*60*60 - date("m", time())*60 - date("s", time());
+// Extra field to include is by default uid
+$ADD = "userid";
 
-// Check for members who were active only this day
-$ADD = "uid";
+// If nickname is installed the extra field is the nickname of the user
 if (EXT_IS_ACTIVE("nickname")) $ADD = "nickname";
 
+// Check for members who were active only this day
 $result = SQL_QUERY_ESC("SELECT userid, ".$ADD.", last_online
-FROM "._MYSQL_PREFIX."_user_data
-WHERE last_online >= %s AND status='CONFIRMED'
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE last_online >= %s AND `status`='CONFIRMED'
 ORDER BY last_online DESC LIMIT %s",
- array($START, $_CONFIG['active_limit']), __FILE__, __LINE__);
+       array(START_TDAY, getConfig('active_limit')), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0)
-{
+// Entries found?
+if (SQL_NUMROWS($result) > 0) {
        // At least one member was online so let's load them all
        $OUT = ""; $SW = 2;
-       while(list($uid, $nick, $last) = SQL_FETCHROW($result))
-       {
+       while (list($uid, $nick, $last) = SQL_FETCHROW($result)) {
                $nick2 = "---";
                if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
 
@@ -80,9 +79,7 @@ if (SQL_NUMROWS($result) > 0)
                // Switch colors
                $SW = 3 - $SW;
        }
-}
- else
-{
+} else {
        // No member was online today! :-(
        $OUT = LOAD_TEMPLATE("guest_active_none_row", true);
 }