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 3304c010744a2679b7b347e1c845724a1162d027..766bd54cfec50ad79be427044013bf2eab9d2e72 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -58,8 +58,11 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
                // Nickname or userid used?
                $nick = NICKNAME_GET_NICK($uidNick);
 
+               // Check for nickname
+               $ret = ($nick != $uidNick);
+
                // Put it in cache
-               $GLOBALS['cache_array']['nick_active'][$uidNick] = (!empty($nick));
+               $GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
        }
 
        // Return nickname
@@ -85,25 +88,27 @@ function NICKNAME_GET_NICK ($userid) {
                // Nickname or userid used?
                if (''.round($userid).'' === ''.$userid.'') {
                        // Userid given
-                       $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `nickname`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
                                array(bigintval($userid)), __FUNCTION__, __LINE__);
-               } else {
-                       // Nickname given
-                       $result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' LIMIT 1",
-                               array($userid), __FUNCTION__, __LINE__);
-               }
 
-               // Found?
-               if (SQL_NUMROWS($result) == 1) {
-                       // Load nickname from database
-                       list($ret) = SQL_FETCHROW($result);
+                       // 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