Rewrite for fetchUserData()

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index c57e681367f8fcefab3a6556f2595f693df13b7c..17b3ae9f72937c50751ce00c2007a095e56001f0 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -634,27 +634,31 @@ function isMember () {
 
 // Fetch user data for given user id
 function fetchUserData ($userid, $column='userid') {
-       // Set it here
-       setCurrentUserId($userid);
+       // If we should look for userid secure&set it here
+       if (substr($column, -2, 2) == 'id') {
+               // Secure userid
+               $userid = bigintval($userid);
+
+               // Set it here
+               setCurrentUserId($userid);
 
-       // Don't look for invalid userids...
-       if ($userid < 1) {
-               // Invalid, so abort here
-               debug_report_bug('User id ' . $userid . ' is invalid.');
+               // Don't look for invalid userids...
+               if ($userid < 1) {
+                       // Invalid, so abort here
+                       debug_report_bug('User id ' . $userid . ' is invalid.');
+               } elseif (isUserDataValid()) {
+                       // Use cache, so it is fine
+                       return true;
+               }
        } elseif (isUserDataValid()) {
                // Use cache, so it is fine
                return true;
        }
 
+
        // By default none was found
        $found = false;
 
-       // Do we have userid/refid?
-       if (($column == 'userid') || ($column == 'refid')) {
-               // Then secure the id
-               $userid = bigintval($userid);
-       } // END - if
-
        // Query for the user
        $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
                array($column, $userid), __FUNCTION__, __LINE__);