X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=4587ea84a93eef09ee5704915cf6ab4b4751fd64;hb=35fd597b272983427fd88f541ea55642e0b42c9e;hp=28d57b316dcf3bdc32cf04c811d9a0a6a8c46925;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 28d57b316d..4587ea84a9 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -199,7 +199,7 @@ function generateUserEmailLink ($email, $mod = 'admin') {
 	} // END - if
 
 	// Search for the email address
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`userid`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
@@ -210,16 +210,16 @@ LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Load userid
-		list($userid) = SQL_FETCHROW($result);
+		list($userid) = sqlFetchRow($result);
 
 		// Rewrite email address to contact link
 		$email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}';
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return rewritten (?) email address
 	return $email;
@@ -241,20 +241,20 @@ function determineRandomReferralId () {
 			$randUserid = mt_rand(0, ($totalUsers - 1));
 
 			// Look for random user
-			$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` " . runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'") . ' AND `rand_confirmed` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1',
+			$result = sqlQueryEscaped("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` " . runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'") . ' AND `rand_confirmed` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1',
 				array($randUserid), __FUNCTION__, __LINE__);
 
 			// Is there one entry there?
-			if (SQL_NUMROWS($result) == 1) {
+			if (sqlNumRows($result) == 1) {
 				// Use that userid as new referral id
-				list($refid) = SQL_FETCHROW($result);
+				list($refid) = sqlFetchRow($result);
 
 				// Debug message
 				/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'refid=' . $refid . ' - choosen!');
 			} // END - if
 
 			// Free result
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 		} // END - if
 	} // END - if
 
@@ -303,10 +303,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	} // END - if
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isUserDataValid()=' . intval(isUserDataValid()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isValidUserData()=' . intval(isValidUserData()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
 
 	// Is there an entry?
-	if (($errorCode == '0') && (isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
+	if (($errorCode == '0') && (isValidUserData()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
 		// Check for old MD5 passwords
 		if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
 			// Just set the hash to the password from DB... :)
@@ -323,7 +323,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 
 			// ... and update database
 			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
 				array($content['hash'], $userid), __FUNCTION__, __LINE__);
 
 			// No login bonus by default
@@ -360,9 +360,9 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',hash=' . $content['hash'] . '(' . strlen($content['hash']) . ')');
 			if ((setSession('userid', $userid )) && (setSession('u_hash', encodeHashForCookie($content['hash'])))) {
 				// Update database records
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
+				sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
 					array($userid), __FUNCTION__, __LINE__);
-				if (!SQL_HASZEROAFFECTED()) {
+				if (!ifSqlHasZeroAffectedRows()) {
 					// Is a success URL set?
 					if (empty($successUrl)) {
 						// Procedure to checking for login data
@@ -387,19 +387,19 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			}
 		} elseif (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
 			// Update failure counter
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
 				array($userid), __FUNCTION__, __LINE__);
 
 			// Wrong password!
 			$errorCode = getCode('WRONG_PASS');
 		}
-	} elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
+	} elseif ((isValidUserData()) && (getUserData('status') != 'CONFIRMED')) {
 		// Create an error code from given status
 		$errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
 		// Set userid in session
 		setSession('userid', getUserData('userid'));
-	} elseif (!isUserDataValid()) {
+	} elseif (!isValidUserData()) {
 		// User id not found
 		$errorCode = getCode('WRONG_ID');
 	} else {
@@ -452,7 +452,7 @@ function doNewUserPassword ($email, $userid) {
 			$newPassword = generatePassword();
 
 			// Update database
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
 				array(
 					generateHash($newPassword),
 					getUserData('userid')
@@ -504,7 +504,7 @@ function getEpocheTimeFromUserStats ($statsType, $statsData, $userid = NULL) {
 	} // END - if
 
 	// Try to find the entry
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	UNIX_TIMESTAMP(`inserted`) AS `inserted`
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats_data`
@@ -520,13 +520,13 @@ LIMIT 1",
 		), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Get this stamp
-		$data = SQL_FETCHARRAY($result);
+		$data = sqlFetchArray($result);
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return stamp
 	return $data['inserted'];
@@ -546,7 +546,7 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 	// Does it exist?
 	if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
 		// Then insert it!
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`, `stats_type`, `stats_data`) VALUES (%s,'%s','%s')",
+		sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`, `stats_type`, `stats_data`) VALUES (%s,'%s','%s')",
 			array(
 				bigintval($userid),
 				$statsType,
@@ -554,7 +554,7 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 			), __FUNCTION__, __LINE__);
 
 		// Does it have worked?
-		$return = (!SQL_HASZEROAFFECTED());
+		$return = (!ifSqlHasZeroAffectedRows());
 	} elseif (is_array($statsData)) {
 		// Invalid data!
 		logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',type=' . $statsType . ',data=' . gettype($statsData) . ': Invalid statistics data type!');
@@ -576,11 +576,11 @@ function doConfirmUserAccount ($hash) {
 	$userid = NULL;
 
 	// Search for an unconfirmed or confirmed account
-	$result = SQL_QUERY_ESC("SELECT `userid`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `userid`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
 		array($hash), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Ok, he want's to confirm now so we load some data
-		list($userid, $refid) = SQL_FETCHROW($result);
+		list($userid, $refid) = sqlFetchRow($result);
 
 		// Fetch user data
 		if (!fetchUserData($userid)) {
@@ -592,7 +592,7 @@ function doConfirmUserAccount ($hash) {
 		$content = getUserDataArray();
 
 		// Unlock his account (but only when it is on UNCONFIRMED!)
-		SQL_QUERY_ESC("UPDATE
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`status`='CONFIRMED',
@@ -604,7 +604,7 @@ LIMIT 1",
 			array($hash), __FILE__, __LINE__);
 
 		// Was it updated?
-		if (!SQL_HASZEROAFFECTED()) {
+		if (!ifSqlHasZeroAffectedRows()) {
 			// Send email if updated
 			$message = loadEmailTemplate('guest_user_confirmed', $content, bigintval($userid));
 
@@ -621,7 +621,7 @@ LIMIT 1",
 					// If version matches add ref bonus to refid's account
 					if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
 						// Add points (directly only!)
-						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
+						sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
 							array(bigintval($refid)), __FILE__, __LINE__);
 
 						// Subtract points from system
@@ -891,17 +891,17 @@ function getSubId ($id) {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$id])) {
 		// Check database for record
-		$result = SQL_QUERY_ESC("SELECT `subid` FROM `{?_MYSQL_PREFIX?}_user_subids` WHERE `id`=%s LIMIT 1",
+		$result = sqlQueryEscaped("SELECT `subid` FROM `{?_MYSQL_PREFIX?}_user_subids` WHERE `id`=%s LIMIT 1",
 			array(bigintval($id)), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Load it
-			list($GLOBALS[__FUNCTION__][$id]) = SQL_FETCHROW($result);
+			list($GLOBALS[__FUNCTION__][$id]) = sqlFetchRow($result);
 		} // END - if
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} // END - if
 
 	// Return cache
@@ -948,7 +948,7 @@ function doExpressionUser ($data) {
 			// Fix all together
 			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
 		}
-	} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
+	} elseif ((!empty($data['callback'])) && (isValidUserData())) {
 		// "Call-back" alias column for current logged in user's data
 		$functionName = "getUserData('" . $data['callback'] . "')";
 	}