X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=50fdef04ef188dabc33b88367882409397589c43;hb=3c0c6ad28a250c08b3fe8b166c589d0d49441ad3;hp=10ad466fa8495b53b99a0a7515c660e7b3f7bb31;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 10ad466fa8..50fdef04ef 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -1,6 +1,6 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/12/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 04/12/2004 *
  * ================                             Last change: 12/01/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -53,12 +53,12 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
 	return;
 } // END - if
 
-$result_depths = SQL_QUERY("SELECT level, percents FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level", __FILE__, __LINE__);
-$totalPoints = 0;
+$result_depths = SQL_QUERY("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level", __FILE__, __LINE__);
+$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_dept`h=%d LIMIT 1",
-		array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+	$result_points = SQL_QUERY_ESC("SELECT `points` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1",
+		array(getMemberId(), bigintval($content['level'])), __FILE__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result_points) == 1) {
@@ -71,13 +71,13 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 
 	// Free result
 	SQL_FREERESULT($result_points);
-}
+} // END - while
 
 // Free memory
 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);
@@ -87,23 +87,33 @@ if (empty($totalPoints)) $totalPoints = '0.00000';
 
 if (!isGetRequestElementSet('payout')) {
 	// Load payout types
-	$result = SQL_QUERY_ESC("SELECT id, type, rate, min_points, allow_url
-FROM `{?_MYSQL_PREFIX?}_payout_types`
-WHERE %s >= min_points
-ORDER BY type ASC",
+	$result = SQL_QUERY_ESC("SELECT
+	`id`, `type`, `rate`, `min_points`, `allow_url`
+FROM
+	`{?_MYSQL_PREFIX?}_payout_types`
+WHERE
+	%s >= `min_points`
+ORDER BY
+	`type` ASC",
 		array($totalPoints), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Check for his payouts
-		$result_payouts = SQL_QUERY_ESC("SELECT p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS banner
-FROM `{?_MYSQL_PREFIX?}_user_payouts` AS p
-LEFT JOIN `{?_MYSQL_PREFIX?}_payout_types` AS t
-ON p.payout_id = t.id
-WHERE p.userid = %s
-ORDER BY p.payout_timestamp DESC",
-			array(getUserId()), __FILE__, __LINE__);
+		$result_payouts = SQL_QUERY_ESC("SELECT
+	p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS banner
+FROM
+	`{?_MYSQL_PREFIX?}_user_payouts` AS p
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_payout_types` AS t
+ON
+	p.payout_id = t.id
+WHERE
+	p.userid = %s
+ORDER BY
+	p.payout_timestamp DESC",
+			array(getMemberId()), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_payouts) > 0) {
 			// List all his requests
 			$OUT = ''; $SW = 2;
@@ -130,14 +140,13 @@ ORDER BY p.payout_timestamp DESC",
 				}
 
 				// 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
@@ -154,6 +163,9 @@ ORDER BY p.payout_timestamp DESC",
 
 		// Output payout list
 		outputPayoutList($totalPoints);
+	} else {
+		// No payout types setup
+		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES'));
 	}
 } else {
 	// Chedk if he can get paid by selected type
@@ -161,16 +173,15 @@ ORDER BY p.payout_timestamp DESC",
 		array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) == 1) {
-		// ID is valid so load the data
+		// id is valid so load the data
 		$content = SQL_FETCHARRAY($result);
-		SQL_FREERESULT($result);
 
 		// 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'];
@@ -185,7 +196,7 @@ ORDER BY p.payout_timestamp DESC",
 				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') {
@@ -193,7 +204,7 @@ ORDER BY p.payout_timestamp DESC",
 					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'),
@@ -202,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'),
@@ -222,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
@@ -233,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'));
@@ -269,9 +280,12 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 			loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH'));
 		}
 	} else {
-		// ID is invalid
+		// id is invalid
 		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID'));
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
 }
 
 // [EOF]