rewritten to new functions, some parts rewritten to filters

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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 8b9fe5bcecdaad182f653205a002da7cebd3e79c..e4922a69f61808e1010e06c1c020aa7720b73217 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -39,29 +39,27 @@ if (!defined('__SECURITY')) {
 
 //
 function NICKNAME_IS_ACTIVE ($uidNick) {
-       global $cacheArray;
-
        // By default nothing is found...
        $ret = false;
 
        // Found in cache?
-       if (isset($cacheArray['nick_active'][$uidNick])) {
+       if (isset($GLOBALS['cache_array']['nick_active'][$uidNick])) {
                // Use it directly
-               $ret = $cacheArray['nick_active'][$uidNick];
+               $ret = $GLOBALS['cache_array']['nick_active'][$uidNick];
 
                // Increment cache counter
                incrementConfigEntry('cache_hits');
        } else {
                // Search in database
                // @TODO Can we replace this with GET_TOTAL_DATA() ?
-               $result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
-                       array(bigintval($uidNick), $uidNick), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
+                       array(bigintval($uidNick), $uidNick), __FUNCTION__, __LINE__);
 
                // Check existence of nickname
                $ret = (SQL_NUMROWS($result) == 1);
 
                // Put it in cache
-               $cacheArray['nick_active'][$uidNick] = $ret;
+               $GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
 
                // Free result
                SQL_FREERESULT($result);
@@ -73,22 +71,20 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
 
 //
 function NICKNAME_GET_NICK ($userid) {
-       global $cacheArray;
-
        // If not found...
        $ret = "";
 
        // Found in cache?
-       if (isset($cacheArray['nicknames'][$userid])) {
+       if (isset($GLOBALS['cache_array']['nicknames'][$userid])) {
                // Use it directly
-               $ret = $cacheArray['nicknames'][$userid];
+               $ret = $GLOBALS['cache_array']['nicknames'][$userid];
 
                // Increment cache counter
                incrementConfigEntry('cache_hits');
        } elseif (NICKNAME_IS_ACTIVE($userid)) {
                // Search for non-empty nickname
-               $result = SQL_QUERY_ESC("SELECT nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
-                       array(bigintval($userid)), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
+                       array(bigintval($userid)), __FUNCTION__, __LINE__);
 
                // Found?
                if (SQL_NUMROWS($result) == 1) {
@@ -96,7 +92,7 @@ function NICKNAME_GET_NICK ($userid) {
                        list($ret) = SQL_FETCHROW($result);
 
                        // Put it in cche
-                       $cacheArray['nicknames'][$userid] = $ret;
+                       $GLOBALS['cache_array']['nicknames'][$userid] = $ret;
                } // END - if
 
                // Free result