X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=26ae46ee72716ddb11b0ab73a2c1736c23219205;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=49e1636cf752868ec687fa294ac9e031696cfaa7;hpb=d495bd859975d08ee459d03c9b1cd51dd9b9304d;p=mailer.git
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 49e1636cf7..26ae46ee72 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -1,7 +1,7 @@
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
@@ -114,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'] = getMessage('PAYOUT_MEMBER_STATUS_'.strtoupper($content['status']).'');
- $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'] = '---';
- }
+ $content['target_bank'] = '{--CLICK_HERE--}';
+ } // END - if
// 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']
- );
+ $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);
@@ -166,12 +121,12 @@ ORDER BY
outputPayoutList($totalPoints);
} else {
// No payout types setup
- loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES'));
+ 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",
- array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
+ $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) {
// id is valid so load the data
@@ -183,8 +138,8 @@ ORDER BY
// Calulcate points from submitted amount
$points = '0';
- if (isPostRequestElementSet('payout')) {
- $points = bigintval(postRequestElement('payout')) / $content['rate'];
+ if (isPostRequestParameterSet('payout')) {
+ $points = bigintval(postRequestParameter('payout')) / $content['rate'];
$PAY_MAX = $max / $content['rate'];
}
@@ -193,8 +148,8 @@ ORDER BY
// Ok, he can get be paid
if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) {
// Remember points in array
- setRequestPostElement('payout_points', translateComma($points));
- setRequestPostElement('type' , $content['type']);
+ setPostRequestParameter('payout_points', translateComma($points));
+ setPostRequestParameter('type' , $content['type']);
// Subtract points from member's account
subtractPoints('payout', getMemberId(), $points);
@@ -206,16 +161,16 @@ ORDER BY
VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
array(
getMemberId(),
- bigintval(postRequestElement('payout')),
- bigintval(getRequestElement('payout')),
- postRequestElement('turl'),
- postRequestElement('alt'),
- postRequestElement('banner')
+ bigintval(postRequestParameter('payout')),
+ bigintval(getRequestParameter('payout')),
+ postRequestParameter('turl'),
+ postRequestParameter('link_text'),
+ postRequestParameter('banner')
), __FILE__, __LINE__);
// Load templates
$message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
- if (getExtensionVersion('admins') >= '0.4.1') {
+ if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
$adm_tpl = 'admin_payout_request_banner';
} else {
$message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
@@ -226,11 +181,11 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
array(
getMemberId(),
- bigintval(postRequestElement('payout')),
- bigintval(postRequestElement('account')),
- postRequestElement('bank'),
- bigintval(getRequestElement('payout')),
- postRequestElement('pass')
+ bigintval(postRequestParameter('payout')),
+ bigintval(postRequestParameter('account')),
+ postRequestParameter('bank'),
+ bigintval(getRequestParameter('payout')),
+ postRequestParameter('pass')
), __FILE__, __LINE__);
// Load templates
@@ -239,28 +194,28 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
$admin_tpl = '';
// @TODO Rewrite this to a filter
- if (getExtensionVersion('admins') >= '0.4.1') {
+ if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
$admin_tpl = 'admin_payout_request';
} // END - if
}
- // Generate task
- createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $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('PAYOUT_REQUEST_MEMBER'), $message_mem);
+ sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJECT--}', $message_mem);
// To admin(s)
- sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId());
+ sendAdminNotification('{--ADMIN_PAYOUY_REQUEST_SUBJECT--}', $admin_tpl, postRequestArray(), getMemberId());
// Load template and output it
- loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
} elseif ($content['allow'] == 'Y') {
// Prepare content
$content = array(
'max' => $max,
'type' => $content['type'],
- 'payout' => bigintval(getRequestElement('payout'))
+ 'payout' => bigintval(getRequestParameter('payout'))
);
// Generate banner order form
@@ -270,7 +225,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
$content = array(
'max' => $max,
'type' => $content['type'],
- 'payout' => bigintval(getRequestElement('payout'))
+ 'payout' => bigintval(getRequestParameter('payout'))
);
// Generate normal form
@@ -278,11 +233,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
}
} else {
// Not enougth points
- loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
}
} else {
// id is invalid
- loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID'));
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
}
// Free result