X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnickname_functions.php;h=f66ade8e1c0227a7d578b3ef5ac1cbbfa4fa0b92;hb=0fddb92c350cad34f4633bb887a2bcc164747b07;hp=08a94a206db0b3c09245175f15e9fcf77cde5e7e;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 08a94a206d..f66ade8e1c 100644
--- 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 - 2012 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