X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_payouts.php;h=4fa53756a50802615fb9320f5982824fabf9a9fb;hp=9b21491ad153bc0d0ad79827b23228b8246841e7;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 9b21491ad1..4fa53756a5 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -48,21 +48,21 @@ addMenuDescription('admin', __FILE__);
 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__);
+		array(getRequestParameter('pid')), __FILE__, __LINE__);
 	list($userid, $tuserid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
 	// Obtain some data
 	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='".$tstamp."' LIMIT 1",
-		array(bigintval($userid)), __FILE__, __LINE__);
+		$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);
 		SQL_FREERESULT($result);
 		if (empty($task)) $task = '0';
 	} elseif ((empty($userid)) || ($userid == '0')) {
 		// Cannot obtain member id!
-		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_USERID'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
 	} else {
 		// Get task id from URL
 		$task = getRequestParameter('task');
@@ -72,60 +72,64 @@ if (isGetRequestParameterSet(('pid'))) {
 		// Load user's data
 		if (!fetchUserData($userid)) {
 			// Abort here because it is not valid!
-			debug_report_bug('No user account ' . $userid . ' found.');
+			debug_report_bug(__FILE__, __LINE__, 'No user account ' . $userid . ' found.');
 		} // END - if
 
-		if ((getRequestParameter('do') == 'accept') && (!empty(getUserData('email')))) {
+		if ((getRequestParameter('do') == 'accept') && (getUserData('email') != '')) {
 			// Ok, now we can output the form or execute accepting
 			if (isFormSent()) {
 				// Obtain payout type and other data
 				$result = SQL_QUERY_ESC("SELECT `payout_id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `id`=%s LIMIT 1",
 					array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
+
+				// Load ptype (id)
 				list($ptype) = SQL_FETCHROW($result);
+
+				// Free result
 				SQL_FREERESULT($result);
 
 				if (!empty($ptype)) {
 					// Obtain data from payout type
-					$result = SQL_QUERY_ESC("SELECT `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`
+					$result = SQL_QUERY_ESC("SELECT
+	`from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`
 FROM
 	`{?_MYSQL_PREFIX?}_payout_types`
 WHERE
 	`id`=%s
 LIMIT 1",
 						array(bigintval($ptype)), __FILE__, __LINE__);
-					list($fuserid, $fpass, $eurl, $eok, $failed, $eenc, $allow) = SQL_FETCHROW($result);
+
+					// Load data
+					$data = SQL_FETCHARRAY($result);
+
+					// Free result
 					SQL_FREERESULT($result);
 
-					if (!empty($eurl)) {
+					if (!empty($data['engine_url'])) {
 						// Ok, run URL...
-						switch ($eenc) {
+						switch ($data['pass_enc']) {
 							case 'md5':
-								$fpass = md5($fpass);
+								$data['from_pass'] = md5($data['from_pass']);
 								$tpass = md5($tpass);
 								break;
 
 							case 'base64':
-								$fpass = base64_encode($fpass);
+								$data['from_pass'] = base64_encode($data['from_pass']);
 								$tpass = base64_encode($tpass);
 								break;
 						}
 
 						// Transfer variables...
-						$eval = "\$URL = \"".$eurl."\";";
-						$reason = encodeString(getMessage('PAYOUT_REASON_PAYOUT'), false);
-
-						// Run code...
-						// @TODO Do we need this time-consuming eval() here?
-						eval($eval);
+						$reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), false);
 
 						// Execute transfer
-						$ret = sendGetRequest($URL);
+						$ret = sendGetRequest($data['engine_url']);
 					} else {
 						// No URL to run
-						$ret[0] = $eok;
+						$ret[0] = $data['engine_ret_ok'];
 					}
 
-					if ($ret[0] == $eok) {
+					if ($ret[0] == $data['engine_ret_ok']) {
 						// Clear task
 						if ($task > 0) {
 							runFilterChain('solve_task', $task);
@@ -139,24 +143,24 @@ LIMIT 1",
 						$message = loadEmailTemplate('member_payout_accepted', postRequestParameter('text'), $userid);
 
 						// Output message
-						if ($allow == 'Y') {
+						if ($data['allow_url'] == 'Y') {
 							// Banner / Textlink request
-							loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_BANNER_ACCEPTED_NOTIFIED'));
+							loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
 						} else {
 							// Normal request
-							loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ACCEPTED_NOTIFIED'));
+							loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
 						}
 
 						// Finally send mail
-						sendEmail(getUserData('email'), getMessage('PAYOUT_ACCEPTED_SUBJECT'), $message);
+						sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_ACCEPTED_SUBJECT'), $message);
 					} else {
 						// Something goes wrong... :-(
-						$content = implode("<br />", $ret);
+						$content = implode('<br />', $ret);
 						loadTemplate('admin_payout_failed_transfer', false, $content);
 					}
 				} else {
 					// Cannot load payout id
-					loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
+					loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
 				}
 			} else {
 				// Prepare content
@@ -169,7 +173,7 @@ LIMIT 1",
 				// Load template
 				loadTemplate('admin_payout_accept_form', false, $content);
 			}
-		} elseif ((getRequestParameter('do') == 'reject') && (!empty(getUserData('email')))) {
+		} elseif ((getRequestParameter('do') == 'reject') && (getUserData('email') != '')) {
 			// Ok, now we can output the form or execute rejecting
 			if (isFormSent()) {
 				if ($task > 0) {
@@ -185,10 +189,10 @@ LIMIT 1",
 				$message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
 				// Output message
-				loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REJECTED_NOTIFIED'));
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
 				// Finally send mail
-				sendEmail(getUserData('email'), getMessage('PAYOUT_REJECTED_SUBJECT'), $message);
+				sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);
 			} else {
 				// Prepare content
 				$content = array(
@@ -202,11 +206,11 @@ LIMIT 1",
 			}
 		} else {
 			// Cannot load user data
-			loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_USERDATA'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
 		}
 	} elseif ((empty($task)) || ($task == '0')) {
 		// Failed loading task id
-		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_TASK_ID'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
 	}
 } else {
 	if (getRequestParameter('do') == 'delete') {
@@ -235,10 +239,10 @@ ORDER BY
 		while ($content = SQL_FETCHARRAY($result)) {
 			if ($content['status'] == 'NEW') {
 				// Generate links for direct accepting and rejecting
-				$content['status'] = '<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=' . $content['id'] . '%}">{--PAYOUT_ACCEPT_PAYOUT--}</a>&nbsp;|&nbsp;<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=' . $content['id'] . '%}">{--PAYOUT_REJECT_PAYOUT--}</a>';
+				$content['status'] = '<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=' . $content['id'] . '%}">{--ADMIN_PAYOUT_ACCEPT_PAYOUT--}</a>|<a href="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=' . $content['id'] . '%}">{--ADMIN_PAYOUT_REJECT_PAYOUT--}</a>';
 			} else {
 				// Translate status
-				$content['status'] = getMessage('PAYOUT_STATUS_'.strtoupper($content['status']).'');
+				$content['status'] = translatePayoutStatus($content['status']);
 				$content['status'] = '<div class="admin_failed">' . $content['status'] . '</div>';
 			}
 
@@ -261,16 +265,9 @@ ORDER BY
 				if (empty($content['target_bank']))    $content['target_bank']    = '---';
 			}
 
-			// Remember data in array for the template
-			$content = array(
-				'sw'      => $SW,
-				'ulink'   => generateUserProfileLink($content['userid']),
-				'ptype'   => translateComma($content['payout_total']) . ' ' . $content['type'],
-				'account' => $content['target_account'],
-				'bank'    => $content['target_bank'],
-				'tstamp'  => generateDateTime($content['payout_timestamp'], 2),
-				'status'  => $content['status'],
-			);
+			// 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);
@@ -284,7 +281,7 @@ ORDER BY
 		loadTemplate('admin_list_payouts', false, $OUT);
 	} else {
 		// No payout requests are sent so far
-		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ADMIN_NO_REQUESTS_FOUND'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
 	}
 }