From: Roland Häder <roland@mxchange.org>
Date: Sat, 26 Feb 2011 05:38:46 +0000 (+0000)
Subject: fetchUserData() does not only fetch user data for a given userid, so  is renamed... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20cff9828debc7f67cda7d4c32a0314aae26b793;p=mailer.git

fetchUserData() does not only fetch user data for a given userid, so  is renamed to reflect this behaviour
---

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 1a13eb1bab..143048b6de 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -427,19 +427,19 @@ function isMember () {
 }
 
 // Fetch user data for given user id
-function fetchUserData ($userid, $column = 'userid') {
+function fetchUserData ($value, $column = 'userid') {
 	// If we should look for userid secure&set it here
 	if (substr($column, -2, 2) == 'id') {
 		// Secure userid
-		$userid = bigintval($userid);
+		$value = bigintval($value);
 
 		// Set it here
-		setCurrentUserId($userid);
+		setCurrentUserId($value);
 
 		// Don't look for invalid userids...
-		if (!isValidUserId($userid)) {
+		if (!isValidUserId($value)) {
 			// Invalid, so abort here
-			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
+			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
 		} elseif (isUserDataValid()) {
 			// Use cache, so it is fine
 			return true;
@@ -454,11 +454,13 @@ function fetchUserData ($userid, $column = 'userid') {
 
 	// Extra statements
 	$ADD = '';
-	if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+	if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+		$ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+	} // END - if
 
 	// Query for the user
 	$result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
-		array($column, $userid), __FUNCTION__, __LINE__);
+		array($column, $value), __FUNCTION__, __LINE__);
 
 	// Do we have a record?
 	if (SQL_NUMROWS($result) == 1) {
@@ -467,6 +469,8 @@ function fetchUserData ($userid, $column = 'userid') {
 
 		// Set the userid for later use
 		setCurrentUserId($data['userid']);
+
+		// And cache the data for this userid
 		$GLOBALS['user_data'][getCurrentUserId()] = $data;
 
 		// Rewrite 'last_failure' if found and ext-user has version >= 0.3.7