X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-primera.php;h=d4ac40f02ee19664449bd8db59d06776a51f592f;hb=da3f62b080afe57e4817cc7bb8b366534503e479;hp=2a1322dbee11f5106ae0d3a870aa66bec457b8d9;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e;p=mailer.git

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 2a1322dbee..d4ac40f02e 100644
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,18 +44,18 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('primera')) && (!isAdmin())) {
 	// Extension 'primera' is not activated
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('primera'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=primera%}');
 	return;
 } // END - if
 
 // 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('PRIMERA_MEMBER_API_DATA_MISSING'));
+	displayMessage('{--MEMBER_PRIMERA_API_DATA_MISSING--}');
 	return;
 } // END - if
 
@@ -66,83 +65,56 @@ $points = false;
 
 // Is the mode set (payout only)
 if (!isGetRequestElementSet('mode')) {
-	// Get referal id
-	$content['refid'] = getConfig(('primera_refid'));
-
-	// Are there some entries?
-	if (fetchUserData(getMemberId())) {
-		// Fetch id
-		$content['primera_nickname'] = getUserData('primera_nickname');
-	} // END - if
-
 	// 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(getMemberId()), __FILE__, __LINE__);
 
 		// Load all rows
-		$content['rows'] = ''; $SW = 2;
+		$content['rows'] = '';
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Prepare data for output
-			$rowContent = array(
-				'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,
-			);
+			$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);
 	} 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(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, sprintf(getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT'), translateComma(getConfig('primera_min_payout'))));
+		displayMessage('{--MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT--}');
 		return;
-	}
+	} // END - if
 
 	// Add points to content array
-	$content['points']     = $points;
-	$content['min_points'] = translateComma(getConfig('primera_min_payout'));
-
-	// Get Primera id
-	$content['primera_nickname'] = '';
-
-	// Do we have a user account? (should be!)
-	if (fetchUserData(getMemberId())) {
-		// Fetch id
-		$content['primera_nickname'] = getUserData('primera_nickname');
-	} // END - if
+	$content['points'] = $points;
 } else {
 	// Invalid mode!
-	loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
+	displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('mode') . '%}');
 	return;
 }
 
@@ -152,24 +124,24 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 	switch (getRequestElement('mode')) {
 		case 'pay': // Payout this exchange -> Primus
 			// Is the user id and password set?
-			if (!isPostRequestElementSet(('primera_nickname'))) {
+			if (!isPostRequestElementSet('primera_nickname')) {
 				// Nothing entered in Primus nickname
-				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_USERNAME'));
-			} elseif (!isPostRequestElementSet(('primera_password'))) {
+				displayMessage('{--MEMBER_PRIMERA_EMPTY_USERNAME--}');
+			} elseif (!isPostRequestElementSet('primera_password')) {
 				// Nothing entered in Primera password
-				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_PASSWORD'));
-			} elseif (!isPostRequestElementSet(('amount'))) {
+				displayMessage('{--MEMBER_PRIMERA_EMPTY_PASSWORD--}');
+			} elseif (!isPostRequestElementSet('amount')) {
 				// Nothing entered in amount
-				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_AMOUNT'));
+				displayMessage('{--MEMBER_PRIMERA_EMPTY_AMOUNT--}');
 			} elseif (postRequestElement('amount') != bigintval(postRequestElement('amount'))) {
 				// Only numbers in amount!
-				loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_INVALID_AMOUNT'));
+				displayMessage('{--MEMBER_PRIMERA_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'))));
+				displayMessage('{--MEMBER_PRIMERA_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)));
+				displayMessage(sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestElement('amount')), bigintval($points)));
 			} else {
 				// All is fine here so do the payout
 				$success = executePrimeraPayout(postRequestElement('primera_nickname'), md5(postRequestElement('primera_password')), postRequestElement('amount'));
@@ -177,13 +149,13 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 					// Default is locked!
 					$locked = true;
 
-					// Shall I 'pay' the referal points imidiately?
+					// Shall I 'pay' the referral points imidiately?
 					if (getConfig('ref_payout') == '0') {
 						// Yes, 'pay' it now
 						$locked = false;
 					} // END - if
 
-					// Remove points from account
+					// Subtract points from account and ignore return status
 					subtractPoints('primera_payout', getMemberId(), postRequestElement('amount'));
 
 					// Update primera nickname
@@ -191,21 +163,21 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
 						array(postRequestElement('primera_nickname'), getMemberId()), __FILE__, __LINE__);
 
 					// All done!
-					loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_PAYOUT_DONE'));
+					displayMessage('{--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
-					loadTemplate('admin_settings_saved', false, GET_PRIMERA_ERROR_MESSAGE());
+					displayMessage(GET_PRIMERA_ERROR_MESSAGE());
 				} else {
 					// Something went wrong
-					loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_FAILED'), GET_PRIMERA_ERROR_MESSAGE()));
+					displayMessage('{%message,MEMBER_PRIMERA_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')));
+			displayMessage('{%message,MEMBER_PRIMERA_MODE_INVALID=' . getRequestElement('mode') . '%}');
 			return;
 	}
 } // END - if