X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=show_bonus.php;h=cc1ad2af634a1e3c2977d1e0bd5ed8a0aba3e386;hb=9d794e925ba857067b03efb20649c72eee9c5797;hp=0615d8517621e86918b67f2acaba27468750635a;hpb=98e388b809fe0f6d5dbe2a02273a11e6816fb333;p=mailer.git
diff --git a/show_bonus.php b/show_bonus.php
index 0615d85176..cc1ad2af63 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -1,7 +1,7 @@
0) && (REQUEST_GET('d') > 0) && (REQUEST_ISSET_GET('t'))) {
+if ((isValidUserId(getRequestParameter('userid'))) && (getRequestParameter('d') > 0) && (isGetRequestParameterSet('t'))) {
// Set row name
$t = '';
- switch (REQUEST_GET('t')) {
+ switch (getRequestParameter('t')) {
case 'bonusid': // Bonus mail
$t = 'bonus_id';
break;
@@ -74,24 +72,31 @@ if ((REQUEST_GET('uid') > 0) && (REQUEST_GET('d') > 0) && (REQUEST_ISSET_GET('t'
break;
default: // Invalid type
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid type %s detected.", REQUEST_GET('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
- `{!_MYSQL_PREFIX!}_bonus_turbo` AS b
+ `{?_MYSQL_PREFIX?}_user_data` AS d
+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(REQUEST_GET('uid')), $t, bigintval(REQUEST_GET('d'))), __FILE__, __LINE__);
+ array(
+ bigintval(getRequestParameter('userid')),
+ $t,
+ bigintval(getRequestParameter('d'))
+ ), __FILE__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -99,44 +104,39 @@ 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(REQUEST_GET('d'));
- $content['rows'] = BONUS_MAKE_RANK_ROWS(bigintval(REQUEST_GET('d')), $t, bigintval(REQUEST_GET('uid')));
+ // @TODO No more needed? $content['points'] = translateComma($content['points']);
+ $content['mailid'] = bigintval(getRequestParameter('d'));
+ $content['rows'] = addBonusRanks(bigintval(getRequestParameter('d')), $t, bigintval(getRequestParameter('userid')));
- // Constant created within previous function which contains informations for current user's ranking position:
- // @TODO Rewrite this constant
- // __YOUR_RANKING_LINE
+ // Get some prepared content
+ $content = merge_array($content, $GLOBALS['ranking_content']);
// Load pre-template
- $content['msg'] = LOAD_TEMPLATE('show_bonus_msg', true, $content);
+ $content['message'] = loadTemplate('show_bonus_msg', true, $content);
} else {
// No data found
- $content['msg'] = "{--BONUS_SHOW_NO_DATA--}";
+ $content['message'] = '{--BONUS_SHOW_NO_DATA--}';
}
// Free memory
SQL_FREERESULT($result);
} else {
// Wrong type entered
- $content['msg'] = "{--BONUS_SHOW_WRONG_TYPE--}";
+ $content['message'] = '{--BONUS_SHOW_WRONG_TYPE--}';
}
} else {
// Wrong call!
- $content['msg'] = "{--BONUS_SHOW_WRONG_CALL--}";
+ $content['message'] = '{--BONUS_SHOW_WRONG_CALL--}';
}
// Load send_bonus header template (for your banners, e.g.?)
-$content['header'] = LOAD_TEMPLATE('show_bonus_header', true);
+$content['header'] = loadTemplate('show_bonus_header', true);
// Load show_bonus footer template (for your banners, e.g.?)
-$content['footer'] = LOAD_TEMPLATE('show_bonus_footer', true);
-
-// Total ranks who can win
-$content['total_ranks'] = getConfig('bonus_ranks');
+$content['footer'] = loadTemplate('show_bonus_footer', true);
// Load final template
-LOAD_TEMPLATE('show_bonus', false, $content);
+loadTemplate('show_bonus', false, $content);
// Include footer
loadIncludeOnce('inc/footer.php');