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

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index 8b9fe5bcec..a569199d57 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                  *
@@ -39,29 +44,27 @@ if (!defined('__SECURITY')) {
 
 //
 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__);
+		$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
+			array(bigintval($uidNick), $uidNick), __FUNCTION__, __LINE__);
 
 		// Check existence of nickname
 		$ret = (SQL_NUMROWS($result) == 1);
 
 		// Put it in cache
-		$cacheArray['nick_active'][$uidNick] = $ret;
+		$GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -73,22 +76,20 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
 
 //
 function NICKNAME_GET_NICK ($userid) {
-	global $cacheArray;
-
 	// If not found...
 	$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__);
+		$result = SQL_QUERY_ESC("SELECT nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
+			array(bigintval($userid)), __FUNCTION__, __LINE__);
 
 		// Found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -96,7 +97,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