Updated copyright year.

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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 08a94a206db0b3c09245175f15e9fcf77cde5e7e..041532790017d453f6bc572cd8c641b1cd80ad01 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/25/2004 *
- * ================                             Last change: 06/25/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 06/25/2004 *
+ * ===================                          Last change: 06/25/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : nickname_functions.php                           *
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,18 +38,18 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
-// Checks wether the nickname is active
+// Checks whether the nickname is active
 function isNicknameOrUserid ($useridNick) {
        // By default nothing is found...
-       $ret = false;
+       $ret = FALSE;
 
        // Found in cache?
        if (isset($GLOBALS['nickname_active'][$useridNick])) {
                // Use it directly
                $ret = $GLOBALS['nickname_active'][$useridNick];
-       } else {
+       } elseif ((!empty($useridNick)) && ($useridNick != '0')) {
                // Nickname or userid used?
                $nick = getNickname($useridNick);
 
@@ -76,27 +75,20 @@ function getNickname ($userid) {
                $ret = $GLOBALS['nicknames'][$userid];
        } else {
                // Init result
-               $result = false;
+               $result = FALSE;
 
                // 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) {
+               if ('' . bigintval($userid, TRUE, FALSE) . '' === '' . $userid . '') {
+                       // Userid given, so try to load user data
+                       if (fetchUserData($userid)) {
                                // Load nickname from database
-                               list($ret) = SQL_FETCHROW($result);
+                               $ret = getUserData('nickname');
 
                                // Put it in cche
                                $GLOBALS['nicknames'][$userid] = $ret;
                        } // END - if
-
-                       // Free result
-                       SQL_FREERESULT($result);
                } else {
-                       // Direct nickname found!
+                       // Direct nickname found
                        $ret = $userid;
 
                        // Put it in cche