X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=show_bonus.php;h=cc1ad2af634a1e3c2977d1e0bd5ed8a0aba3e386;hb=9d794e925ba857067b03efb20649c72eee9c5797;hp=616973e472e963980e22c4b17cb680da29beb87e;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git
diff --git a/show_bonus.php b/show_bonus.php
index 616973e472..cc1ad2af63 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -1,7 +1,7 @@
0) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
+if ((isValidUserId(getRequestParameter('userid'))) && (getRequestParameter('d') > 0) && (isGetRequestParameterSet('t'))) {
// Set row name
$t = '';
- switch (getRequestElement('t')) {
+ switch (getRequestParameter('t')) {
case 'bonusid': // Bonus mail
$t = 'bonus_id';
break;
@@ -71,24 +72,31 @@ if ((getRequestElement('userid') > 0) && (getRequestElement('d') > 0) && (isGetR
break;
default: // Invalid type
- logDebugMessage(__FILE__, __LINE__, sprintf("Invalid type %s detected.", getRequestElement('t')));
+ logDebugMessage(__FILE__, __LINE__, sprintf("Invalid type %s detected.", getRequestParameter('t')));
break;
} // END - switch
// Valid type?
if (!empty($t)) {
// Check for data
- $result = SQL_QUERY_ESC("SELECT d.gender, d.surname, d.family, b.level, b.points
+ $result = SQL_QUERY_ESC("SELECT
+ d.`gender`, d.`surname`, d.`family`, b.`level`, b.`points`
FROM
`{?_MYSQL_PREFIX?}_user_data` AS d
-RIGHT JOIN
+INNER JOIN
`{?_MYSQL_PREFIX?}_bonus_turbo` AS b
ON
- d.userid=b.userid
+ d.`userid`=b.`userid`
WHERE
- d.`status`='CONFIRMED' AND d.userid=%s AND b.%s=%s
+ d.`status`='CONFIRMED' AND
+ d.`userid`=%s AND
+ b.`%s`=%s
LIMIT 1",
- array(bigintval(getRequestElement('userid')), $t, bigintval(getRequestElement('d'))), __FILE__, __LINE__);
+ array(
+ bigintval(getRequestParameter('userid')),
+ $t,
+ bigintval(getRequestParameter('d'))
+ ), __FILE__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -96,27 +104,29 @@ LIMIT 1",
$content = SQL_FETCHARRAY($result);
// Prepare constants for the pre-template
- $content['gender'] = translateGender($content['gender']);
- $content['points'] = translateComma($content['points']);
- $content['mailid'] = bigintval(getRequestElement('d'));
- $content['rows'] = addBonusRanks(bigintval(getRequestElement('d')), $t, bigintval(getRequestElement('userid')));
+ // @TODO No more needed? $content['points'] = translateComma($content['points']);
+ $content['mailid'] = bigintval(getRequestParameter('d'));
+ $content['rows'] = addBonusRanks(bigintval(getRequestParameter('d')), $t, bigintval(getRequestParameter('userid')));
+
+ // Get some prepared content
+ $content = merge_array($content, $GLOBALS['ranking_content']);
// Load pre-template
$content['message'] = loadTemplate('show_bonus_msg', true, $content);
} else {
// No data found
- $content['message'] = "{--BONUS_SHOW_NO_DATA--}";
+ $content['message'] = '{--BONUS_SHOW_NO_DATA--}';
}
// Free memory
SQL_FREERESULT($result);
} else {
// Wrong type entered
- $content['message'] = "{--BONUS_SHOW_WRONG_TYPE--}";
+ $content['message'] = '{--BONUS_SHOW_WRONG_TYPE--}';
}
} else {
// Wrong call!
- $content['message'] = "{--BONUS_SHOW_WRONG_CALL--}";
+ $content['message'] = '{--BONUS_SHOW_WRONG_CALL--}';
}
// Load send_bonus header template (for your banners, e.g.?)
@@ -125,9 +135,6 @@ $content['header'] = loadTemplate('show_bonus_header', true);
// Load show_bonus footer template (for your banners, e.g.?)
$content['footer'] = loadTemplate('show_bonus_footer', true);
-// Total ranks who can win
-$content['total_ranks'] = getConfig('bonus_ranks');
-
// Load final template
loadTemplate('show_bonus', false, $content);