Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:

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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index f3e258bb4a8d72065aea02cceb69e00b0dfe9c3a..766bd54cfec50ad79be427044013bf2eab9d2e72 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -55,28 +55,14 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
                // Increment cache counter
                incrementConfigEntry('cache_hits');
        } else {
-               // Init result
-               $result = false;
-
                // Nickname or userid used?
-               if (''.round($uidNick).'' === ''.$uidNick.'') {
-                       // Userid given
-                       $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
-                               array(bigintval($uidNick)), __FUNCTION__, __LINE__);
-               } else {
-                       // Nickname given
-                       $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' LIMIT 1",
-                               array($uidNick), __FUNCTION__, __LINE__);
-               }
+               $nick = NICKNAME_GET_NICK($uidNick);
 
-               // Check existence of nickname
-               $ret = (SQL_NUMROWS($result) == 1);
+               // Check for nickname
+               $ret = ($nick != $uidNick);
 
                // Put it in cache
                $GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
-
-               // Free result
-               SQL_FREERESULT($result);
        }
 
        // Return nickname
@@ -95,32 +81,39 @@ function NICKNAME_GET_NICK ($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)), __FUNCTION__, __LINE__);
+       } else {
+               // Init result
+               $result = false;
 
-               // Found?
-               if (SQL_NUMROWS($result) == 1) {
-                       // Load nickname from database
-                       list($ret) = SQL_FETCHROW($result);
+               // Nickname or userid used?
+               if (''.round($userid).'' === ''.$userid.'') {
+                       // Userid given
+                       $result = SQL_QUERY_ESC("SELECT `nickname`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
+                               array(bigintval($userid)), __FUNCTION__, __LINE__);
+
+                       // Found?
+                       if (SQL_NUMROWS($result) == 1) {
+                               // Load nickname from database
+                               list($ret) = SQL_FETCHROW($result);
+
+                               // Put it in cche
+                               $GLOBALS['cache_array']['nicknames'][$userid] = $ret;
+                       } // END - if
+
+                       // Free result
+                       SQL_FREERESULT($result);
+               } else {
+                       // Direct nickname found!
+                       $ret = $userid;
 
                        // Put it in cche
                        $GLOBALS['cache_array']['nicknames'][$userid] = $ret;
-               } // END - if
-
-               // Free result
-               SQL_FREERESULT($result);
+               }
        }
 
        // Return nickname
        return $ret;
 }
 
-// Simple wrapper function
-function NICKNAME_PROBE_ON_USERID ($uid) {
-       return (NICKNAME_GET_NICK($uid) != '');
-}
-
 //
 ?>