Several template fixes/cleanups, naming convention applied:

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index fe6b508a80bcf9d4ad3f11fe43cbb6d147fb8298..a6eb714ec53faae9e9585d5e49d6cb8d74ca0f49 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -79,15 +79,18 @@ if ((getRequestParameter('userid') > 0) && (getRequestParameter('d') > 0) && (is
        // 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(getRequestParameter('userid')),
@@ -101,8 +104,7 @@ LIMIT 1",
                        $content = SQL_FETCHARRAY($result);
 
                        // Prepare constants for the pre-template
-                       $content['gender'] = translateGender($content['gender']);
-                       $content['points'] = translateComma($content['points']);
+                       // @TODO No more needed? $content['points'] = translateComma($content['points']);
                        $content['mailid'] = bigintval(getRequestParameter('d'));
                        $content['rows']   = addBonusRanks(bigintval(getRequestParameter('d')), $t, bigintval(getRequestParameter('userid')));