X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=8db1add8eec3f395088e332ae3afecb487848b6a;hp=8e62a5bd70a42d0c6157b128378735fc753b3765;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 8e62a5bd70..8db1add8ee 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -48,24 +48,24 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('payout')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('payout'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=payout%}');
 	return;
 } // END - if
 
 // Translate point into comma
-$totalPoints = getTotalPoints(getMemberId());
+$payoutPoints = getPayoutPoints(getMemberId());
 
 if (!isGetRequestParameterSet('payout')) {
 	// Load payout types
 	$result = SQL_QUERY_ESC("SELECT
-	`id`, `type`, `rate`, `min_points`, `allow_url`
+	`id`,`type`,`rate`,`min_points`,`allow_url`
 FROM
 	`{?_MYSQL_PREFIX?}_payout_types`
 WHERE
 	%s >= `min_points`
 ORDER BY
 	`type` ASC",
-		array($totalPoints), __FILE__, __LINE__);
+		array($payoutPoints), __FILE__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		// Free memory
 		SQL_FREERESULT($result);
@@ -116,14 +116,14 @@ ORDER BY
 		SQL_FREERESULT($result_payouts);
 
 		// Output payout list
-		outputPayoutList($totalPoints);
+		outputPayoutList($payoutPoints);
 	} else {
 		// No payout types setup
-		loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+		displayMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
 	}
 } else {
 	// Chedk if he can get paid by selected type
-	$result = SQL_QUERY_ESC("SELECT `type`, `rate`, `min_points`, `allow_url` AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `type`,`rate`,`min_points`,`allow_url` AS allow FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
 		array(bigintval(getRequestParameter('payout'))), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) == 1) {
@@ -131,7 +131,7 @@ ORDER BY
 		$content = SQL_FETCHARRAY($result);
 
 		// Calculate maximum value
-		$max     = round($totalPoints * $content['rate'] - 0.5);
+		$max     = round($payoutPoints * $content['rate'] - 0.5);
 		$PAY_MAX = '0';
 
 		// Calulcate points from submitted amount
@@ -142,20 +142,20 @@ ORDER BY
 		}
 
 		// Has enougth points to payout?
-		if ($totalPoints >= $content['min_points']) {
+		if ($payoutPoints >= $content['min_points']) {
 			// Ok, he can get be paid
 			if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) {
 				// Remember points in array
 				setPostRequestParameter('payout_points', $points);
 				setPostRequestParameter('type'         , $content['type']);
 
-				// Subtract points from member's account
+				// Subtract points from member's account and ignore return status
 				subtractPoints('payout', getMemberId(), $points);
 
 				// Add entry to his tranfer history
 				if ($content['allow'] == 'Y') {
 					// Banner/textlink ordered
-					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`, `payout_total`, `payout_id`, `payout_timestamp`, `status`, `target_url`, `link_text`, `banner_url`)
+					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`,`payout_total`,`payout_id`,`payout_timestamp`,`status`,`target_url`,`link_text`,`banner_url`)
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 					array(
 						getMemberId(),
@@ -175,7 +175,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 					}
 				} else {
 					// e-currency payout requested
-					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`, `payout_total`, `target_account`, `target_bank`, `payout_id`, `payout_timestamp`, `status`, `password`)
+					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_payouts` (`userid`,`payout_total`,`target_account`,`target_bank`,`payout_id`,`payout_timestamp`,`status`,`password`)
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 					array(
 						getMemberId(),
@@ -207,7 +207,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 				sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
 
 				// Load template and output it
-				loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
+				displayMessage('{--MEMBER_PAYOUT_REQUEST_SENT--}');
 			} elseif ($content['allow'] == 'Y') {
 				// Prepare content
 				$content = array(
@@ -231,11 +231,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 			}
 		} else {
 			// Not enougth points
-			loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
+			displayMessage('{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
 		}
 	} else {
 		// id is invalid
-		loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
+		displayMessage('{--MEMBER_PAYOUT_ID_INVALID--}');
 	}
 
 	// Free result