X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-primera.php;h=f87b0b5ba6f4e4975f24e9a521c22622c7fa04d2;hb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5;hp=83b76264eb492b4d937bbe812467f6f10ce9f68c;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;p=mailer.git

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 83b76264eb..f87b0b5ba6 100644
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/09/2008 *
- * ================                             Last change: 09/09/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/09/2008 *
+ * ===================                          Last change: 09/09/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-primera.php                                 *
@@ -69,39 +69,26 @@ if (!isGetRequestElementSet('mode')) {
 	// Get referal id
 	$content['refid'] = getConfig(('primera_refid'));
 
-	// Get Primus id
-	$result = SQL_QUERY_ESC("SELECT `primera_userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-		array(getUserId()), __FILE__, __LINE__);
-
-	// Are there some entries?
-	if (SQL_NUMROWS($result) == 1) {
-		// Fetch id
-		list($content['primera_nickname']) = SQL_FETCHROW($result);
-	} // END - if
-
-	// Free result
-	SQL_FREERESULT($result);
-
 	// Is there an id?
 	if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('mode'))) {
 		// Then use an other "mode"
-		setRequestGetElement('mode', 'list');
+		setGetRequestElement('mode', 'list');
 
 		// And load all rows!
 		$result = SQL_QUERY_ESC("SELECT `id`,`primera_account`,`primera_amount`,`primera_timestamp`,`primera_type` FROM `{?_MYSQL_PREFIX?}_user_primera` WHERE `userid`=%s ORDER BY `primera_timestamp` DESC",
-			array(getUserId()), __FILE__, __LINE__);
+			array(getMemberId()), __FILE__, __LINE__);
 
 		// Load all rows
 		$content['rows'] = ''; $SW = 2;
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Prepare data for output
 			$rowContent = array(
-				'stamp'		=> generateDateTime($data['primera_timestamp'], 2),
-				'points'		=> translateComma($data['primera_amount']),
-				'acc'		=> SQL_ESCAPE($data['primera_account']),
-				'status'		=> PRIMERA_TRANSFER_STATUS($data['primera_type']),
-				'raw_type'	=> strtolower($data['primera_type']),
-				'sw'			=> $SW,
+				'primera_timestamp' => generateDateTime($data['primera_timestamp'], 2),
+				'points'            => translateComma($data['primera_amount']),
+				'primera_account'   => SQL_ESCAPE($data['primera_account']),
+				'status'            => PRIMERA_TRANSFER_STATUS($data['primera_type']),
+				'raw_type'          => strtolower($data['primera_type']),
+				'sw'                => $SW,
 			);
 
 			// Load row template
@@ -113,13 +100,13 @@ if (!isGetRequestElementSet('mode')) {
 		SQL_FREERESULT($result);
 	} else {
 		// Mode pay
-		setRequestGetElement('mode', 'pay');
+		setGetRequestElement('mode', 'pay');
 	}
 } // END - if
 
 if (getRequestElement('mode') == 'pay') {
 	// Get total points and check if the user can request a payout
-	$points = countSumTotalData(getUserId(), 'user_points', 'points') - countSumTotalData(getUserId(), 'user_data', 'used_points');
+	$points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
 	// No dots here...
 	$points = explode('.', $points);
@@ -131,30 +118,15 @@ if (getRequestElement('mode') == 'pay') {
 	// Is this enougth for a payout?
 	if ($points < getConfig('primera_min_payout')) {
 		// No, then abort here
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'), translateComma(getConfig('primera_min_payout'))));
+		loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'));
 		return;
 	}
 
 	// Add points to content array
-	$content['points']     = $points;
-	$content['min_points'] = translateComma(getConfig('primera_min_payout'));
-
-	// Get Primera id
-	$content['primera_nickname'] = '';
-	$result = SQL_QUERY_ESC("SELECT `primera_userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-		array(getUserId()), __FILE__, __LINE__);
-
-	// Are there some entries?
-	if (SQL_NUMROWS($result) == 1) {
-		// Fetch id
-		list($content['primera_nickname']) = SQL_FETCHROW($result);
-	}
-
-	// Free result
-	SQL_FREERESULT($result);
+	$content['points'] = $points;
 } else {
 	// Invalid mode!
-	loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestElement('mode')));
 	return;
 }
 
@@ -178,7 +150,7 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_INVALID_AMOUNT'));
 			} elseif (postRequestElement('amount') < getConfig('primera_min_payout')) {
 				// Not enougth entered!
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_AMOUNT_SMALLER_MIN'), getConfig(('primera_min_payout'))));
+				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_AMOUNT_SMALLER_MIN'));
 			} elseif (postRequestElement('amount') > $points) {
 				// Not enougth points left!
 				loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestElement('amount')), bigintval($points)));
@@ -190,17 +162,17 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 					$locked = true;
 
 					// Shall I 'pay' the referal points imidiately?
-					if (getConfig('ref_payout') == 0) {
+					if (getConfig('ref_payout') == '0') {
 						// Yes, 'pay' it now
 						$locked = false;
 					} // END - if
 
 					// Remove points from account
-					subtractPoints('primera_payout', getUserId(), postRequestElement('amount'));
+					subtractPoints('primera_payout', getMemberId(), postRequestElement('amount'));
 
 					// Update primera nickname
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `primera_userid`=%s WHERE `userid`=%s LIMIT 1",
-						array(postRequestElement('primera_nickname'), getUserId()), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `primera_nickname`=%s WHERE `userid`=%s LIMIT 1",
+						array(postRequestElement('primera_nickname'), getMemberId()), __FILE__, __LINE__);
 
 					// All done!
 					loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_PAYOUT_DONE'));
@@ -210,14 +182,14 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 					loadTemplate('admin_settings_saved', false, GET_PRIMERA_ERROR_MESSAGE());
 				} else {
 					// Something went wrong
-					loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_FAILED'), GET_PRIMERA_ERROR_MESSAGE()));
+					loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE()));
 				}
 			}
 			break;
 
 		default: // Invalid mode!
 			logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestElement('mode')));
-			loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestElement('mode')));
 			return;
 	}
 } // END - if