X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=ba12785779e0d203a637d3240792a3f3711b09c5;hb=4cec044b57773e28423261c71f918f3e22ca8a75;hp=624d8e1d5c385a5549a944cfdb55509462a964c5;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;p=mailer.git

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 624d8e1d5c..ba12785779 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/12/2004 *
- * ================                             Last change: 12/01/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 04/12/2004 *
+ * ===================                          Last change: 12/01/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-payout.php                                  *
@@ -54,11 +54,11 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
 } // END - if
 
 $result_depths = SQL_QUERY("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level", __FILE__, __LINE__);
-$totalPoints = 0;
+$totalPoints = '0';
 while ($content = SQL_FETCHARRAY($result_depths)) {
 	// Load referal points
 	$result_points = SQL_QUERY_ESC("SELECT `points` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1",
-		array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+		array(getMemberId(), bigintval($content['level'])), __FILE__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result_points) == 1) {
@@ -77,7 +77,7 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 SQL_FREERESULT($result_depths);
 
 // Get used points
-$usedPoints = countSumTotalData(getUserId(), 'user_data', 'used_points');
+$usedPoints = countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
 // Translate point into comma
 $totalPoints = ($totalPoints - $usedPoints);
@@ -113,7 +113,7 @@ WHERE
 	p.userid = %s
 ORDER BY
 	p.payout_timestamp DESC",
-			array(getUserId()), __FILE__, __LINE__);
+			array(getMemberId()), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_payouts) > 0) {
 			// List all his requests
 			$OUT = ''; $SW = 2;
@@ -140,14 +140,13 @@ ORDER BY
 				}
 
 				// Prepare data for the template
-				// @TODO Rewritings: acc->target_account,bank->target_bank in templates
 				$content = array(
-					'sw'     => $SW,
-					'acc'    => $content['target_account'],
-					'points' => translateComma($content['payout_total']) . ' ' . $content['type'],
-					'bank'   => $content['target_bank'],
-					'stamp'  => generateDateTime($content['payout_timestamp'], 2),
-					'status' => $content['status']
+					'sw'               => $SW,
+					'target_account'   => $content['target_account'],
+					'points'           => translateComma($content['payout_total']) . ' ' . $content['type'],
+					'target_bank'      => $content['target_bank'],
+					'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2),
+					'status'           => $content['status']
 				);
 
 				// Load row template and switch colors
@@ -179,10 +178,10 @@ ORDER BY
 
 		// Calculate maximum value
 		$max     = round($totalPoints * $content['rate'] - 0.5);
-		$PAY_MAX = 0;
+		$PAY_MAX = '0';
 
 		// Calulcate points from submitted amount
-		$points = 0;
+		$points = '0';
 		if (isPostRequestElementSet('payout')) {
 			$points  = bigintval(postRequestElement('payout')) / $content['rate'];
 			$PAY_MAX = $max / $content['rate'];
@@ -197,7 +196,7 @@ ORDER BY
 				setRequestPostElement('type'         , $content['type']);
 
 				// Subtract points from member's account
-				subtractPoints('payout', getUserId(), $points);
+				subtractPoints('payout', getMemberId(), $points);
 
 				// Add entry to his tranfer history
 				if ($content['allow'] == 'Y') {
@@ -205,7 +204,7 @@ ORDER BY
 					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(
-						getUserId(),
+						getMemberId(),
 						bigintval(postRequestElement('payout')),
 						bigintval(getRequestElement('payout')),
 						postRequestElement('turl'),
@@ -214,18 +213,18 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 					), __FILE__, __LINE__);
 
 					// Load templates
-					$message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getUserId());
+					$message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
 					if (getExtensionVersion('admins') >= '0.4.1') {
 						$adm_tpl = 'admin_payout_request_banner';
 					} else {
-						$message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getUserId());
+						$message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
 					}
 				} 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`)
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 					array(
-						getUserId(),
+						getMemberId(),
 						bigintval(postRequestElement('payout')),
 						bigintval(postRequestElement('account')),
 						postRequestElement('bank'),
@@ -234,8 +233,8 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 					), __FILE__, __LINE__);
 
 					// Load templates
-					$message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getUserId());
-					$message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getUserId());
+					$message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getMemberId());
+					$message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getMemberId());
 					$admin_tpl = '';
 
 					// @TODO Rewrite this to a filter
@@ -245,13 +244,13 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 				}
 
 				// Generate task
-				createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getUserId());
+				createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
 				// Send out mails
-				sendEmail(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem);
+				sendEmail(getMemberId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem);
 
 				// To admin(s)
-				sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getUserId());
+				sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId());
 
 				// Load template and output it
 				loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));