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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index f985f52086..3304c01074 100644
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -55,28 +55,11 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
 		// Increment cache counter
 		incrementConfigEntry('cache_hits');
 	} else {
-		// Init result
-		$result = false;
-
 		// Nickname or userid used?
-		if (round($uidNick) == $uidNick) {
-			// Userid given
-			$result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid` =%s LIMIT 1",
-				array(bigintval($uidNick)), __FUNCTION__, __LINE__);
-		} else {
-			// Nickname given
-			$result = SQL_QUERY_ESC("SELECT `userid`  FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' LIMIT 1",
-				array($uidNick), __FUNCTION__, __LINE__);
-		}
-
-		// Check existence of nickname
-		$ret = (SQL_NUMROWS($result) == 1);
+		$nick = NICKNAME_GET_NICK($uidNick);
 
 		// Put it in cache
-		$GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
-
-		// Free result
-		SQL_FREERESULT($result);
+		$GLOBALS['cache_array']['nick_active'][$uidNick] = (!empty($nick));
 	}
 
 	// Return nickname
@@ -95,10 +78,20 @@ function NICKNAME_GET_NICK ($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)), __FUNCTION__, __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) {
@@ -117,10 +110,5 @@ function NICKNAME_GET_NICK ($userid) {
 	return $ret;
 }
 
-// Simple wrapper function
-function NICKNAME_PROBE_ON_USERID ($uid) {
-	return (NICKNAME_GET_NICK($uid) != '');
-}
-
 //
 ?>