X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_payouts.php;h=9a95ae69504833b3ac550d2075d9c7af904d4ff3;hb=29157685184b9aa2ddbf42e9d2e49141af95f7e2;hp=cd00ee72957235a3e92adabf80c9b4be4f3cdd25;hpb=fc162164725588cf75969f707faead9c9cd8e68b;p=mailer.git

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index cd00ee7295..9a95ae6950 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestParameterSet(('pid'))) {
+if (isGetRequestParameterSet('pid')) {
 	// First let's get the member's id
 	$result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `id`=%s LIMIT 1",
 		array(getRequestParameter('pid')), __FILE__, __LINE__);
@@ -53,22 +53,22 @@ if (isGetRequestParameterSet(('pid'))) {
 	SQL_FREERESULT($result);
 
 	// Obtain some data
-	if (!isGetRequestParameterSet(('task')) && (!empty($userid)) && ($userid > 0)) {
+	if (!isGetRequestParameterSet('task') && (!empty($userid)) && ($userid > 0)) {
 		// Get task id from database
 		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `userid`=%s AND `task_type`='PAYOUT_REQUEST' AND `task_created`=%s LIMIT 1",
 			array(bigintval($userid), bigintval($tstamp)), __FILE__, __LINE__);
-		list($task) = SQL_FETCHROW($result);
+		list($taskId) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
-		if (empty($task)) $task = '0';
+		if (empty($taskId)) $taskId = '0';
 	} elseif ((empty($userid)) || ($userid == '0')) {
 		// Cannot obtain member id!
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
 	} else {
 		// Get task id from URL
-		$task = getRequestParameter('task');
+		$taskId = getRequestParameter('task');
 	}
 
-	if ((!empty($task)) && (!empty($userid)) && ($userid > 0)) {
+	if ((!empty($taskId)) && (!empty($userid)) && ($userid > 0)) {
 		// Load user's data
 		if (!fetchUserData($userid)) {
 			// Abort here because it is not valid!
@@ -117,7 +117,7 @@ LIMIT 1",
 								$data['from_pass'] = base64_encode($data['from_pass']);
 								$tpass = base64_encode($tpass);
 								break;
-						}
+						} // END - switch
 
 						// Transfer variables...
 						$reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), false);
@@ -131,8 +131,8 @@ LIMIT 1",
 
 					if ($ret[0] == $data['engine_ret_ok']) {
 						// Clear task
-						if ($task > 0) {
-							runFilterChain('solve_task', $task);
+						if ($taskId > 0) {
+							runFilterChain('solve_task', $taskId);
 						}
 
 						// Clear payout request
@@ -165,7 +165,7 @@ LIMIT 1",
 			} else {
 				// Prepare content
 				$content = array(
-					'task' => $task,
+					'task' => $taskId,
 					'pid'  => bigintval(getRequestParameter('pid')),
 					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
 				);
@@ -176,9 +176,9 @@ LIMIT 1",
 		} elseif ((getRequestParameter('do') == 'reject') && (getUserData('email') != '')) {
 			// Ok, now we can output the form or execute rejecting
 			if (isFormSent()) {
-				if ($task > 0) {
+				if ($taskId > 0) {
 					// Clear task
-					runFilterChain('solve_task', $task);
+					runFilterChain('solve_task', $taskId);
 				} // END - if
 
 				// Clear payout request
@@ -196,7 +196,7 @@ LIMIT 1",
 			} else {
 				// Prepare content
 				$content = array(
-					'task' => $task,
+					'task' => $taskId,
 					'pid'  => bigintval(getRequestParameter('pid')),
 					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
 				);
@@ -208,7 +208,7 @@ LIMIT 1",
 			// Cannot load user data
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
 		}
-	} elseif ((empty($task)) || ($task == '0')) {
+	} elseif ((empty($taskId)) || ($taskId == '0')) {
 		// Failed loading task id
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
 	}
@@ -233,9 +233,9 @@ ON
 ORDER BY
 	p.payout_timestamp DESC", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found payouts
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			if ($content['status'] == 'NEW') {
 				// Generate links for direct accepting and rejecting
@@ -243,7 +243,6 @@ ORDER BY
 			} else {
 				// Translate status
 				$content['status'] = translatePayoutStatus($content['status']);
-				$content['status'] = '<div class="admin_failed">' . $content['status'] . '</div>';
 			}
 
 			// Nothing entered must be secured in member/what-payputs.php !
@@ -259,19 +258,13 @@ ORDER BY
 
 				// Admins can addionally test the URL for framekillers
 				$content['target_bank'] = '<a href="' . generateFrametesterUrl($content['url']) . '" target="_blank">{--CLICK_HERE--}</a>';
-			} else {
-				// e-currency payout request
-				if (empty($content['target_account'])) $content['target_account'] = '---';
-				if (empty($content['target_bank']))    $content['target_bank']    = '---';
-			}
+			} // END - if
 
 			// Add/Translate some data
-			$content['sw']               = $SW;
 			$content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
 
 			// Add row and switch color
 			$OUT .= loadTemplate('admin_list_payouts_row', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory