X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=b4fefbb35d5de0499468da2f06fac8c2b8f7652f;hp=cc9c5fcc660c78acea43ab93ac2221561b3d8c44;hb=e46fa203829954370ce793156c78ce5c4600d020;hpb=22ba0c36c75ff989a6f48197c5a71524fb891b87

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index cc9c5fcc66..b4fefbb35d 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -49,7 +49,7 @@ function alpha ($sortby, $colspan, $return=false) {
 	if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('mode');
 
 	/* Creates the list of letters and makes them a link. */
-	$alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
+	$alphabet = explode(',', 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,');
 	$num = count($alphabet) - 1;
 	$OUT = '';
 	while (list($counter, $ltr) = each($alphabet)) {
@@ -70,8 +70,14 @@ function alpha ($sortby, $colspan, $return=false) {
 		}
 	} // END - while
 
+	// Prepare content
+	$content = array (
+		'colspan2'        => $colspan,
+		'alpha_selection' => $OUT
+	);
+
 	// Load template
-	$OUT = loadTemplate('admin_list_user_alpha', true, $OUT);
+	$OUT = loadTemplate('admin_list_user_alpha', true, $content);
 	if ($return === true) {
 		// Return generated code
 		return $OUT;
@@ -95,19 +101,19 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
 
 	// Makes order by links..
-	if ($letter == 'front') $letter = getMessage('_ALL2');
+	if ($letter == 'front') $letter = '';
 
 	// Prepare array with all possible sorters
 	$list = array(
-		'userid'      => getMessage('_UID'),
-		'family'      => getMessage('FAMILY'),
-		'email'       => getMessage('EMAIL'),
-		'REMOTE_ADDR' => getMessage('REMOTE_IP')
+		'userid'      => '{--_UID--}',
+		'family'      => '{--FAMILY--}',
+		'email'       => '{--EMAIL--}',
+		'REMOTE_ADDR' => '{--REMOTE_IP--}'
 	);
 
 	// Add nickname if extension is installed
 	if (isExtensionActive('nickname')) {
-		$list['nickname'] = getMessage('NICKNAME');
+		$list['nickname'] = '{--NICKNAME--}';
 	} // END - if
 
 	foreach ($list as $sort => $title) {
@@ -118,7 +124,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 		}
 	} // END - foreach
 
+	// Add list and colspan
 	$content['list'] = substr($OUT, 0, -13);
+	$content['colspan2'] = $colspan;
 
 	// Load template
 	$OUT = loadTemplate('admin_list_user_sort', true, $content);
@@ -134,7 +142,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 }
 
 // Add page navigation
-function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) {
+function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=false) {
 	// @TODO These two constants are no longer used, maybe we reactivate this code?
 	//if ($showForm === true) {
 	//	// Load form for changing number of lines
@@ -147,11 +155,11 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
 	//}
 
 	$OUT = '';
-	for ($page = 1; $page <= $pages; $page++) {
+	for ($page = 1; $page <= $numPages; $page++) {
 		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
 			$OUT .= '<strong>-';
 		} else {
-			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+			if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
 			if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
 			// Base link
@@ -173,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
 			$OUT .= '</a>';
 		}
 
-		if ($page < $pages) $OUT .= '|';
+		if ($page < $numPages) $OUT .= '|';
 	} // END - for
 
-	// Remember the list
-	$content['list'] = $OUT;
+	// Remember the list and colspan
+	$content['list']     = $OUT;
+	$content['colspan2'] = $colspan;
 
 	// Load template
 	$OUT = loadTemplate('admin_list_user_pagenav', true, $content);
@@ -230,7 +239,7 @@ function determineRandomReferalId () {
 	// Is the extension version fine?
 	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')."");
+		$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= {?user_min_confirmed?}");
 
 		// Do we have at least one?
 		if ($totalUsers > 0) {
@@ -267,6 +276,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 	$add = '';
 	$errorCode = '0';
 	$ext = '';
+	$isFound = false;
 
 	// Init array
 	$content = array(
@@ -287,11 +297,11 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 		$ext = 'nickname';
 	} else {
 		// Direct userid entered
-		fetchUserData($userid);
+		$isFound = fetchUserData($userid);
 	}
 
 	// No error found?
-	if ($errorCode == '0') {
+	if (($errorCode == '0') && ($isFound === true)) {
 		// 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']);
@@ -376,7 +386,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 			// Wrong password!
 			$errorCode = getCode('WRONG_PASS');
 		}
-	} elseif (getUserData('status') != 'CONFIRMED') {
+	} elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
 		// Create an error code from given status
 		$errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
@@ -419,7 +429,7 @@ function doNewUserPassword ($email, $userid) {
 		// Nickname entered
 		$result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' OR `userid`='%s' OR `email`='%s' LIMIT 1",
 			array($userid, $userid, $email), __FUNCTION__, __LINE__);
-	} elseif (($userid > 0) && (empty($email))) {
+	} elseif ((isValidUserId($userid)) && (empty($email))) {
 		// Direct userid entered
 		$result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
 			array(bigintval($userid)), __FUNCTION__, __LINE__);
@@ -444,10 +454,10 @@ function doNewUserPassword ($email, $userid) {
 			$message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
 			// ... and send it away
-			sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
+			sendEmail($userid, '{--GUEST_NEW_PASSWORD--}', $message);
 
 			// Output note to user
-			loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+			loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
 		} else {
 			// Account is locked or unconfirmed
 			$errorCode = generateErrorCodeFromUserStatus($status);
@@ -521,11 +531,51 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 	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__);
+			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!");
+		logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',type=' . $statsType . ',data=' . gettype($statsData) . ': Invalid statistics data type!');
+	}
+}
+
+// Expression call-back function for fetching user data
+function doExpressionUser ($data) {
+	// Use current userid by default
+	$functionName = 'getMemberId()';
+
+	// User-related data, so is there a userid?
+	if (!empty($data['matches'][4][$data['key']])) {
+		// Do we have a userid or $userid?
+		if ($data['matches'][4][$data['key']] == '$userid') {
+			// Use dynamic call
+			$functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
+		} elseif (!empty($data['matches'][4][$data['key']])) {
+			// User data found
+			$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
+		}
+	} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
+		// "Call-back" alias column for current logged in user's data
+		$functionName = "getUserData('" . $data['callback'] . "')";
 	}
+
+	// Do we have another function to run (e.g. translations)
+	if (!empty($data['extra_func'])) {
+		// Surround the original function call with it
+		$functionName = $data['extra_func'] . '(' . $functionName . ')';
+	} // END - if
+
+	// Generate replacer
+	$replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
+
+	// Now replace the code
+	$code = replaceExpressionCode($data, $replacer);
+
+	// Return replaced code
+	return $code;
 }
 
 // [EOF]