More fixes for what/action deprecation in modules.php

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

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 02c0b4166336ca35043b6448801dc40e2348f711..2a475b86aadbbe1c094602f152e142546ad4fe72 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -39,17 +39,13 @@ if (!defined('__SECURITY')) {
 
 // Filter for updates/extends on the online list
 function FILTER_UPDATE_ONLINE_LIST () {
-       global $PHPSESSID;
-
        // Do not update online list when extension is deactivated
        if (!EXT_IS_ACTIVE("online", true)) return;
 
        // Empty session?
-       if (empty($PHPSESSID)) {
+       if (session_id() == "") {
                // This is invalid here!
-               print "Invalid session. Backtrace:<pre>";
-               debug_print_backtrace();
-               die("</pre>");
+               debug_report_bug("Invalid session.");
        } // END - if
 
        // Initialize variables
@@ -73,13 +69,13 @@ 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($PHPSESSID), __FILE__, __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
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_online` SET
 module='%s',
 action='%s',
 what='%s',
@@ -99,12 +95,12 @@ WHERE sid='%s' LIMIT 1",
                                $MEM,
                                $ADMIN,
                                GET_REMOTE_ADDR(),
-                               $PHPSESSID
-                       ), __FILE__, __LINE__
+                               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'],
@@ -113,9 +109,9 @@ WHERE sid='%s' LIMIT 1",
                                $rid,
                                $MEM,
                                $ADMIN,
-                               $PHPSESSID,
+                               session_id(),
                                GET_REMOTE_ADDR()
-                       ), __FILE__, __LINE__
+                       ), __FUNCTION__, __LINE__
                );
        }
 
@@ -123,8 +119,8 @@ WHERE sid='%s' LIMIT 1",
        SQL_FREERESULT($result);
 
        // Purge old entries
-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
-               array(getConfig('online_timeout')), __FILE__, __LINE__);
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_online` WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
+               array(getConfig('online_timeout')), __FUNCTION__, __LINE__);
 }
 
 //