X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnickname_functions.php;h=3304c010744a2679b7b347e1c845724a1162d027;hp=8b9fe5bcecdaad182f653205a002da7cebd3e79c;hb=4d64a8575593f7cc8f69aec74d14c29ba6e8ef6c;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 8b9fe5bcec..3304c01074 100644
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Nickname-Funktionen                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,62 +38,60 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-//
+// Checks wether the nickname is active
 function NICKNAME_IS_ACTIVE ($uidNick) {
-	global $cacheArray;
-
 	// By default nothing is found...
 	$ret = false;
 
 	// Found in cache?
-	if (isset($cacheArray['nick_active'][$uidNick])) {
+	if (isset($GLOBALS['cache_array']['nick_active'][$uidNick])) {
 		// Use it directly
-		$ret = $cacheArray['nick_active'][$uidNick];
+		$ret = $GLOBALS['cache_array']['nick_active'][$uidNick];
 
 		// Increment cache counter
 		incrementConfigEntry('cache_hits');
 	} else {
-		// Search in database
-		// @TODO Can we replace this with GET_TOTAL_DATA() ?
-		$result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
-			array(bigintval($uidNick), $uidNick), __FILE__, __LINE__);
-
-		// Check existence of nickname
-		$ret = (SQL_NUMROWS($result) == 1);
+		// Nickname or userid used?
+		$nick = NICKNAME_GET_NICK($uidNick);
 
 		// Put it in cache
-		$cacheArray['nick_active'][$uidNick] = $ret;
-
-		// Free result
-		SQL_FREERESULT($result);
+		$GLOBALS['cache_array']['nick_active'][$uidNick] = (!empty($nick));
 	}
 
 	// Return nickname
 	return $ret;
 }
 
-//
+// "Getter" for nickname for specfied userid
 function NICKNAME_GET_NICK ($userid) {
-	global $cacheArray;
-
 	// If not found...
-	$ret = "";
+	$ret = '';
 
 	// Found in cache?
-	if (isset($cacheArray['nicknames'][$userid])) {
+	if (isset($GLOBALS['cache_array']['nicknames'][$userid])) {
 		// Use it directly
-		$ret = $cacheArray['nicknames'][$userid];
+		$ret = $GLOBALS['cache_array']['nicknames'][$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)), __FILE__, __LINE__);
+	} 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__);
+		}
 
 		// Found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -96,7 +99,7 @@ function NICKNAME_GET_NICK ($userid) {
 			list($ret) = SQL_FETCHROW($result);
 
 			// Put it in cche
-			$cacheArray['nicknames'][$userid] = $ret;
+			$GLOBALS['cache_array']['nicknames'][$userid] = $ret;
 		} // END - if
 
 		// Free result
@@ -107,10 +110,5 @@ function NICKNAME_GET_NICK ($userid) {
 	return $ret;
 }
 
-// Simple wrapper function
-function NICKNAME_PROBE_ON_USERID ($uid) {
-	return (NICKNAME_GET_NICK($uid) != "");
-}
-
 //
 ?>