X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=ca86a9b5f88182e50c2ba16fd2ad19bf97755b92;hp=709369f4adcd1804a89d3ac407deb61f78c1516e;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 709369f4ad..ca86a9b5f8 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -228,7 +228,7 @@ function determineRandomReferalId () {
 	$refid = '0';
 
 	// Is the extension version fine?
-	if (getExtensionVersion('user') >= '0.3.4') {
+	if (isExtensionInstalledAndNewer('user', '0.3.4')) {
 		// Get all user ids
 		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
 
@@ -290,9 +290,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 		fetchUserData($userid);
 	}
 
-	// Get user data array and set userid (e.g. important if we login with nickname)
-	$content = getUserDataArray();
-	if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+	// No error found?
+	if ($errorCode == '0') {
+		// Get user data array and set userid (e.g. important if we login with nickname)
+		$content = getUserDataArray();
+		if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+	} // END - if
 
 	// Is there an entry?
 	if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
@@ -328,10 +331,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 				$GLOBALS['bonus_payed'] = true;
 
 				// Subtract login bonus from userid's account or jackpot
-				if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
+				if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
 			} // END - if
 
-			// @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+			// @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 
 			// Set member id
 			setMemberId($userid);
@@ -348,14 +351,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 						// Procedure to checking for login data
 						if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
 							// Bonus added (just displaying!)
-							$URL = 'modules.php?module=chk_login&mode=bonus';
+							$url = 'modules.php?module=chk_login&mode=bonus';
 						} else {
 							// Bonus not added
-							$URL = 'modules.php?module=chk_login&mode=login';
+							$url = 'modules.php?module=chk_login&mode=login';
 						}
 					} else {
 						// Use this URL
-						$URL = $successUrl;
+						$url = $successUrl;
 					}
 				} else {
 					// Cannot update counter!
@@ -365,7 +368,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 				// Cookies not setable!
 				$errorCode = getCode('COOKIES_DISABLED');
 			}
-		} elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
+		} elseif (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
 			// Update failture counter
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
 				array($userid), __FUNCTION__, __LINE__);
@@ -390,14 +393,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	// Error code provided?
 	if ($errorCode > 0) {
 		// Then reconstruct the URL
-		$URL = $errorUrl . $errorCode;
+		$url = $errorUrl . $errorCode;
 
 		// Extension set? Then add it as well.
-		if (!empty($ext)) $URL .= '&ext=' . $ext;
+		if (!empty($ext)) $url .= '&ext=' . $ext;
 	} // END - if
 
 	// Return URL
-	return $URL;
+	return $url;
 }
 
 // Try to send a new password for the given user account
@@ -461,5 +464,69 @@ function doNewUserPassword ($email, $userid) {
 	return $errorCode;
 }
 
+// Get timestamp for given stats type and data
+function getTimestampFromUserStats ($statsType, $statsData, $userid = '0') {
+	// Default timestamp is zero
+	$data['inserted'] = '0';
+
+	// User id set?
+	if ((isMemberIdSet()) && ($userid == '0')) {
+		$userid = getMemberId();
+	} // END - if
+
+	// Is the extension installed and updated?
+	if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+		// Return zero here
+		return $data['inserted'];
+	} // END - if
+
+	// Try to find the entry
+	$result = SQL_QUERY_ESC("SELECT
+	UNIX_TIMESTAMP(`inserted`) AS inserted
+FROM
+	`{?_MYSQL_PREFIX?}_user_stats_data`
+WHERE
+	`userid`=%s AND
+	`stats_type`='%s' AND
+	`stats_data`='%s'
+LIMIT 1",
+		array(
+			bigintval($userid),
+			$statsType,
+			$statsData
+		), __FUNCTION__, __LINE__);
+
+	// Is the entry there?
+	if (SQL_NUMROWS($result) == 1) {
+		// Get this stamp
+		$data = SQL_FETCHARRAY($result);
+	} // END - if
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return stamp
+	return $data['inserted'];
+}
+
+// Inserts user stats
+function insertUserStatsRecord ($userid, $statsType, $statsData) {
+	// Is the extension installed and updated?
+	if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+		// Return zero here
+		return false;
+	} // END - if
+
+	// Does it exist?
+	if ((!getTimestampFromUserStats($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')",
+			array(bigintval($userid), $statsType, $statsData), __FUNCTION__, __LINE__);
+	} elseif (is_array($statsData)) {
+		// Invalid data!
+		logDebugMessage(__FUNCTION__, __LINE__, "userid={$userid},type={$statsType},data={".gettype($statsData).": Invalid statistics data type!");
+	}
+}
+
 // [EOF]
 ?>