X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnickname_functions.php;h=aa7e715ead06b6f0c3544c77c6dd5e2372640e27;hb=496a9a8159ba42133179e0535afbd5622c3b39d8;hp=3304c010744a2679b7b347e1c845724a1162d027;hpb=e68b8cfcab0c81e457a324990505c8e6a85e3b7b;p=mailer.git

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 3304c01074..aa7e715ead 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                           *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,28 +39,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+	die();
+} // END - if
 
 // Checks wether the nickname is active
-function NICKNAME_IS_ACTIVE ($uidNick) {
+function isNicknameOrUserid ($useridNick) {
 	// By default nothing is found...
 	$ret = false;
 
 	// Found in cache?
-	if (isset($GLOBALS['cache_array']['nick_active'][$uidNick])) {
+	if (isset($GLOBALS['nickname_active'][$useridNick])) {
 		// Use it directly
-		$ret = $GLOBALS['cache_array']['nick_active'][$uidNick];
-
-		// Increment cache counter
-		incrementConfigEntry('cache_hits');
+		$ret = $GLOBALS['nickname_active'][$useridNick];
 	} else {
 		// Nickname or userid used?
-		$nick = NICKNAME_GET_NICK($uidNick);
+		$nick = getNickname($useridNick);
+
+		// Check for nickname
+		$ret = ($nick == $useridNick);
 
 		// Put it in cache
-		$GLOBALS['cache_array']['nick_active'][$uidNick] = (!empty($nick));
+		$GLOBALS['nickname_active'][$useridNick] = $ret;
 	}
 
 	// Return nickname
@@ -67,48 +67,40 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
 }
 
 // "Getter" for nickname for specfied userid
-function NICKNAME_GET_NICK ($userid) {
+function getNickname ($userid) {
 	// If not found...
 	$ret = '';
 
 	// Found in cache?
-	if (isset($GLOBALS['cache_array']['nicknames'][$userid])) {
+	if (isset($GLOBALS['nicknames'][$userid])) {
 		// Use it directly
-		$ret = $GLOBALS['cache_array']['nicknames'][$userid];
-
-		// Increment cache counter
-		incrementConfigEntry('cache_hits');
+		$ret = $GLOBALS['nicknames'][$userid];
 	} else {
 		// Init result
 		$result = false;
 
 		// 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",
-				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__);
-		}
+		if ('' . round($userid) . '' === '' . $userid . '') {
+			// Userid given, so try to load user data
+			if (fetchUserData($userid)) {
+				// Load nickname from database
+				$ret = getUserData('nickname');
 
-		// Found?
-		if (SQL_NUMROWS($result) == 1) {
-			// Load nickname from database
-			list($ret) = SQL_FETCHROW($result);
+				// Put it in cche
+				$GLOBALS['nicknames'][$userid] = $ret;
+			} // END - if
+		} else {
+			// Direct nickname found!
+			$ret = $userid;
 
 			// Put it in cche
-			$GLOBALS['cache_array']['nicknames'][$userid] = $ret;
-		} // END - if
-
-		// Free result
-		SQL_FREERESULT($result);
+			$GLOBALS['nicknames'][$userid] = $ret;
+		}
 	}
 
 	// Return nickname
 	return $ret;
 }
 
-//
+// [EOF]
 ?>