Fix for SQL error

[mailer.git] / inc / libs / online_functions.php

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 827754965ce40b88813288d79b1d978b4d5b0d03..0348497e653d61eabc66243f9e87ac155c72e31a 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Online-Funktionen                                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,34 +38,34 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Filter for updates/extends on the online list
 function FILTER_UPDATE_ONLINE_LIST () {
        // Do not update online list when extension is deactivated
-       if (!EXT_IS_ACTIVE("online", true)) return;
+       if (!EXT_IS_ACTIVE('online', true)) return;
 
        // Empty session?
-       if (session_id() == "") {
+       if (session_id() == '') {
                // This is invalid here!
                debug_report_bug("Invalid session.");
        } // END - if
 
        // Initialize variables
-       $uid = 0; $rid = 0; $MEM = "N"; $ADMIN = "N";
+       $uid = 0; $rid = 0; $MEM = 'N'; $ADMIN = 'N';
 
        // Valid userid?
        if ((isUserIdSet()) && (getUserId() > 0) && (IS_MEMBER())) {
                // Is valid user
                $uid = getUserId();
-               $MEM = "Y";
+               $MEM = 'Y';
        } // END - if
 
        if (IS_ADMIN()) {
                // Is administrator
-               $ADMIN = "Y";
+               $ADMIN = 'Y';
        } // END - if
 
        if (!empty($GLOBALS['refid'])) {
@@ -74,59 +74,61 @@ function FILTER_UPDATE_ONLINE_LIST () {
        } // END - if
 
        // Now search for the user
-       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_online` WHERE sid='%s' LIMIT 1",
-               array(session_id()), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{!_MYSQL_PREFIX!}_online` WHERE `sid`='%s' LIMIT 1",
+       array(session_id()), __FUNCTION__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
                // Then update it
-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_online` SET
-module='%s',
-action='%s',
-what='%s',
-userid=%s,
-refid=%s,
-is_member='%s',
-is_admin='%s',
-timestamp=UNIX_TIMESTAMP(),
-ip='%s'
-WHERE sid='%s' LIMIT 1",
-                       array(
-                               $GLOBALS['module'],
-                               $GLOBALS['action'],
-                               $GLOBALS['what'],
-                               $uid,
-                               $rid,
-                               $MEM,
-                               $ADMIN,
-                               GET_REMOTE_ADDR(),
-                               session_id()
-                       ), __FUNCTION__, __LINE__
-               );
+               SQL_QUERY_ESC("UPDATE
+       `{!_MYSQL_PREFIX!}_online`
+SET
+       `module`='%s',
+       `action`='%s',
+       `what`='%s',
+       `userid`=%s,
+       `refid`=%s,
+       `is_member`='%s',
+       `is_admin`='%s',
+       `timestamp`=UNIX_TIMESTAMP(),
+       `ip`='%s'
+WHERE 
+       `sid`='%s'
+LIMIT 1",
+               array(
+                       getModule(),
+                       getAction(),
+                       getWhat(),
+                       $uid,
+                       $rid,
+                       $MEM,
+                       $ADMIN,
+                       detectRemoteAddr(),
+                       session_id()
+               ), __FUNCTION__, __LINE__);
        } else {
                // No entry does exists so we simply add it!
-               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_online` (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_online` (`module`, `action`, `what`, `userid`, `refid`, `is_member`, `is_admin`, `timestamp`, `sid`, `ip`) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
                        array(
-                               $GLOBALS['module'],
-                               $GLOBALS['action'],
-                               $GLOBALS['what'],
+                               getModule(),
+                               getAction(),
+                               getWhat(),
                                $uid,
                                $rid,
                                $MEM,
                                $ADMIN,
                                session_id(),
-                               GET_REMOTE_ADDR()
-                       ), __FUNCTION__, __LINE__
-               );
+                               detectRemoteAddr()
+                       ), __FUNCTION__, __LINE__);
        }
 
        // Free result
        SQL_FREERESULT($result);
 
        // Purge old entries
-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_online` WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_online` WHERE `timestamp` <= (UNIX_TIMESTAMP() - %s)",
                array(getConfig('online_timeout')), __FUNCTION__, __LINE__);
 }
 
-//
+// [EOF]
 ?>