X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnickname_functions.php;h=6fdb1916d77dd531aa672129157c21bb21a1b170;hb=f2736bc6457140146890877d992be862a78b259f;hp=766bd54cfec50ad79be427044013bf2eab9d2e72;hpb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;p=mailer.git

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 766bd54cfe..6fdb1916d7 100644
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,31 +38,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // 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 != $uidNick);
+		$ret = ($nick == $useridNick);
 
 		// Put it in cache
-		$GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
+		$GLOBALS['nickname_active'][$useridNick] = $ret;
 	}
 
 	// Return nickname
@@ -70,17 +66,14 @@ 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;
@@ -88,7 +81,7 @@ function NICKNAME_GET_NICK ($userid) {
 		// 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",
+			$result = SQL_QUERY_ESC("SELECT `nickname`  FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
 				array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 			// Found?
@@ -97,7 +90,7 @@ function NICKNAME_GET_NICK ($userid) {
 				list($ret) = SQL_FETCHROW($result);
 
 				// Put it in cche
-				$GLOBALS['cache_array']['nicknames'][$userid] = $ret;
+				$GLOBALS['nicknames'][$userid] = $ret;
 			} // END - if
 
 			// Free result
@@ -107,7 +100,7 @@ function NICKNAME_GET_NICK ($userid) {
 			$ret = $userid;
 
 			// Put it in cche
-			$GLOBALS['cache_array']['nicknames'][$userid] = $ret;
+			$GLOBALS['nicknames'][$userid] = $ret;
 		}
 	}
 
@@ -115,5 +108,5 @@ function NICKNAME_GET_NICK ($userid) {
 	return $ret;
 }
 
-//
+// [EOF]
 ?>