New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index ae13a3a68d237477eeeeb3ff837904976c106dcf..3d8578fc8443a47fa64efd2a290f238864980609 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Online-Funktionen                                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -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 ((!empty($GLOBALS['userid'])) && ($GLOBALS['userid'] > 0) && (IS_MEMBER())) {
+       if ((isUserIdSet()) && (getUserId() > 0) && (IS_MEMBER())) {
                // Is valid user
-               $uid = bigintval($GLOBALS['userid']);
-               $MEM = "Y";
+               $uid = getUserId();
+               $MEM = 'Y';
        } // END - if
 
        if (IS_ADMIN()) {
                // Is administrator
-               $ADMIN = "Y";
+               $ADMIN = 'Y';
        } // END - if
 
        if (!empty($GLOBALS['refid'])) {
@@ -81,9 +81,9 @@ function FILTER_UPDATE_ONLINE_LIST () {
        if (SQL_NUMROWS($result) == 1) {
                // Then update it
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_online` SET
-module='%s',
-action='%s',
-what='%s',
+`module`='%s',
+`action`='%s',
+`what`='%s',
 userid=%s,
 refid=%s,
 is_member='%s',
@@ -99,7 +99,7 @@ WHERE sid='%s' LIMIT 1",
                                $rid,
                                $MEM,
                                $ADMIN,
-                               GET_REMOTE_ADDR(),
+                               detectRemoteAddr(),
                                session_id()
                        ), __FUNCTION__, __LINE__
                );
@@ -115,7 +115,7 @@ WHERE sid='%s' LIMIT 1",
                                $MEM,
                                $ADMIN,
                                session_id(),
-                               GET_REMOTE_ADDR()
+                               detectRemoteAddr()
                        ), __FUNCTION__, __LINE__
                );
        }