X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-primera.php;h=075bcefdffe54b730eef8475b05464231d89e9e1;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=b8f8557b5c74942216b84da8af8f38f98243d147;hpb=60c415b4e890472115cc0ad0f62290e7af71d205;p=mailer.git

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index b8f8557b5c..075bcefdff 100644
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -57,7 +57,7 @@ if ((!isExtensionActive('primera')) && (!isAdmin())) {
 // Check if the admin has entered the data
 if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) {
 	// Something important is missing...
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_API_DATA_MISSING'));
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_API_DATA_MISSING--}');
 	return;
 } // END - if
 
@@ -67,9 +67,6 @@ $points = false;
 
 // Is the mode set (payout only)
 if (!isGetRequestParameterSet('mode')) {
-	// Get referal id
-	$content['refid'] = getConfig(('primera_refid'));
-
 	// Is there an id?
 	if ((!empty($content['primera_nickname'])) && (!isGetRequestParameterSet('mode'))) {
 		// Then use an other "mode"
@@ -80,15 +77,14 @@ if (!isGetRequestParameterSet('mode')) {
 			array(getMemberId()), __FILE__, __LINE__);
 
 		// Load all rows
-		$content['rows'] = ''; $SW = 2;
+		$content['rows'] = '';
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Prepare data for output
 			$rowContent['primera_timestamp'] = generateDateTime($data['primera_timestamp'], 2);
 
 			// Load row template
 			$content['rows'] .= loadTemplate('member_primera_mode_list_row', true, $rowContent);
-			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free result
 		SQL_FREERESULT($result);
@@ -100,21 +96,21 @@ if (!isGetRequestParameterSet('mode')) {
 
 if (getRequestParameter('mode') == 'pay') {
 	// Get total points and check if the user can request a payout
-	$points = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+	$points = getTotalPoints(getMemberId());
 
 	// No dots here...
 	$points = explode('.', $points);
 	$points = bigintval($points[0]);
 
 	// Remove the registration fee
-	$points = $points - getConfig('points_register');
+	$points = $points - getPointsRegister();
 
 	// Is this enougth for a payout?
 	if ($points < getConfig('primera_min_payout')) {
 		// No, then abort here
-		loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT'));
+		loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
 		return;
-	}
+	} // END - if
 
 	// Add points to content array
 	$content['points'] = $points;
@@ -130,21 +126,21 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
 	switch (getRequestParameter('mode')) {
 		case 'pay': // Payout this exchange -> Primus
 			// Is the user id and password set?
-			if (!isPostRequestParameterSet(('primera_nickname'))) {
+			if (!isPostRequestParameterSet('primera_nickname')) {
 				// Nothing entered in Primus nickname
-				loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_USERNAME'));
-			} elseif (!isPostRequestParameterSet(('primera_password'))) {
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_USERNAME--}');
+			} elseif (!isPostRequestParameterSet('primera_password')) {
 				// Nothing entered in Primera password
-				loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_PASSWORD'));
-			} elseif (!isPostRequestParameterSet(('amount'))) {
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_PASSWORD--}');
+			} elseif (!isPostRequestParameterSet('amount')) {
 				// Nothing entered in amount
-				loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_AMOUNT'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_EMPTY_AMOUNT--}');
 			} elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) {
 				// Only numbers in amount!
-				loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_INVALID_AMOUNT'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_INVALID_AMOUNT--}');
 			} elseif (postRequestParameter('amount') < getConfig('primera_min_payout')) {
 				// Not enougth entered!
-				loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_AMOUNT_SMALLER_MIN'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_AMOUNT_SMALLER_MIN--}');
 			} elseif (postRequestParameter('amount') > $points) {
 				// Not enougth points left!
 				loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points)));
@@ -169,7 +165,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) {
 						array(postRequestParameter('primera_nickname'), getMemberId()), __FILE__, __LINE__);
 
 					// All done!
-					loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_PAYOUT_DONE'));
+					loadTemplate('admin_settings_saved', false, '{--MEMBER_PRIMERA_PAYOUT_DONE--}');
 					return;
 				} elseif ((GET_PRIMERA_ERROR_CODE() == 'user_failed') || (GET_PRIMERA_ERROR_CODE() == 'own_failed') || (GET_PRIMERA_ERROR_CODE() == 'amount_failed') || (GET_PRIMERA_ERROR_CODE() == 'api_amount_failed')) {
 					// Wrong login data