Double question mark fixed

[mailer.git] / inc / libs / nickname_functions.php

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index f2f9366987f76f2a1eddf734dc1753abe67fbdfc..f3ec02b214696c2abdf77c88c4ea8a795a091ac5 100644 (file)
--- 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                           *
@@ -14,10 +14,9 @@
  * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 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,80 +37,68 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+       die();
+} // END - if
 
-//
-function NICKNAME_IS_ACTIVE ($uidNick) {
+// Checks wether the nickname is active
+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 {
-               // 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), __FUNCTION__, __LINE__);
+               // Nickname or userid used?
+               $nick = getNickname($useridNick);
 
-               // Check existence of nickname
-               $ret = (SQL_NUMROWS($result) == 1);
+               // Check for nickname
+               $ret = ($nick == $useridNick);
 
                // Put it in cache
-               $GLOBALS['cache_array']['nick_active'][$uidNick] = $ret;
-
-               // Free result
-               SQL_FREERESULT($result);
+               $GLOBALS['nickname_active'][$useridNick] = $ret;
        }
 
        // Return nickname
        return $ret;
 }
 
-//
-function NICKNAME_GET_NICK ($userid) {
+// "Getter" for nickname for specfied 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');
-       } 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__);
-
-               // Found?
-               if (SQL_NUMROWS($result) == 1) {
-                       // Load nickname from database
-                       list($ret) = SQL_FETCHROW($result);
+               $ret = $GLOBALS['nicknames'][$userid];
+       } else {
+               // Init result
+               $result = false;
+
+               // Nickname or userid used?
+               if ('' . round($userid) . '' === '' . $userid . '') {
+                       // Userid given, so try to load user data
+                       if (fetchUserData($userid)) {
+                               // Load nickname from database
+                               $ret = getUserData('nickname');
+
+                               // 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;
 }
 
-// Simple wrapper function
-function NICKNAME_PROBE_ON_USERID ($uid) {
-       return (NICKNAME_GET_NICK($uid) != "");
-}
-
-//
+// [EOF]
 ?>