X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=26ae46ee72716ddb11b0ab73a2c1736c23219205;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=a73ae1afca13e3e620fa46a4b3dd81df638f2838;hpb=60c415b4e890472115cc0ad0f62290e7af71d205;p=mailer.git
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index a73ae1afca..26ae46ee72 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -54,17 +54,8 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
return;
} // END - if
-// Get total points
-$totalPoints = countSumTotalData(getMemberId(), 'user_points', 'points');
-
-// Get used points
-$usedPoints = countSumTotalData(getMemberId(), 'user_data', 'used_points');
-
// Translate point into comma
-$totalPoints = ($totalPoints - $usedPoints);
-
-// Sanity check...
-if (empty($totalPoints)) $totalPoints = '0.00000';
+$totalPoints = getTotalPoints(getMemberId());
if (!isGetRequestParameterSet('payout')) {
// Load payout types
@@ -77,13 +68,13 @@ WHERE
ORDER BY
`type` ASC",
array($totalPoints), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// 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
+ 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, p.banner_url AS banner
FROM
`{?_MYSQL_PREFIX?}_user_payouts` AS p
LEFT JOIN
@@ -95,50 +86,33 @@ WHERE
ORDER BY
p.payout_timestamp DESC",
array(getMemberId()), __FILE__, __LINE__);
- if (SQL_NUMROWS($result_payouts) > 0) {
+ if (!SQL_HASZERONUMS($result_payouts)) {
// List all his requests
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($content = SQL_FETCHARRAY($result_payouts)) {
- // Translate status
- $content['status'] = translatePayoutStatus();
- $content['status'] = '
' . $content['status'] . '
';
-
// Nothing entered must be secured in member/what-payputs.php !
if ($content['allow'] == 'Y') {
// Banner/Textlink views/clicks request
if (!empty($content['banner'])) {
// Banner
- $content['target_account'] = '
';
+ $content['target_account'] = '
';
} else {
// Textlink
- $content['target_account'] = $content['alt'];
+ $content['target_account'] = $content['link_text'];
}
$content['target_bank'] = '{--CLICK_HERE--}';
- } else {
- // e-currency payout request
- if (empty($content['target_account'])) $content['target_account'] = '---';
- if (empty($content['target_bank'])) $content['target_bank'] = '---';
- }
+ } // END - if
// Prepare data for the template
- $content = array(
- 'sw' => $SW,
- 'target_account' => $content['target_account'],
- 'payout_total' => $content['payout_total'],
- 'target_bank' => $content['target_bank'],
- 'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2),
- 'status' => $content['status'],
- 'type' => $content['type'],
- );
+ $content['payout_timestamp'] = generateDateTime($content['payout_timestamp'], 2);
// Load row template and switch colors
$OUT .= loadTemplate('member_payout_row', true, $content);
- $SW = 3 - $SW;
- }
+ } // END - while
// Load template
loadTemplate('member_payout', false, $OUT);
- }
+ } // END - if
// Free memory
SQL_FREERESULT($result_payouts);
@@ -147,11 +121,11 @@ ORDER BY
outputPayoutList($totalPoints);
} else {
// No payout types setup
- loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_SETUP_INCOMPLETE'));
+ loadTemplate('admin_settings_saved', false, '{--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) {
@@ -190,7 +164,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
bigintval(postRequestParameter('payout')),
bigintval(getRequestParameter('payout')),
postRequestParameter('turl'),
- postRequestParameter('alt'),
+ postRequestParameter('link_text'),
postRequestParameter('banner')
), __FILE__, __LINE__);
@@ -225,17 +199,17 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
} // END - if
}
- // Generate task
- createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
+ // Generate task (we ignore the task id here)
+ createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
// Send out mails
- sendEmail(getMemberId(), getMessage('MEMBER_PAYOUT_REQUEST_SUBJ'), $message_mem);
+ sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem);
// To admin(s)
- sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
+ sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
// Load template and output it
- loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_REQUEST_SENT'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
} elseif ($content['allow'] == 'Y') {
// Prepare content
$content = array(
@@ -259,11 +233,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
}
} else {
// Not enougth points
- loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_POINTS_NOT_ENOUGTH'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
}
} else {
// id is invalid
- loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PAYOUT_ID_INVALID'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
}
// Free result