Rewrites/fixes for handling config entries in SQLs

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 11b24eee014c0b6fb583c62edef108bc1d9729eb..7b5bffac08891a8b1b4cd89e48acd5e35c8290e8 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -63,7 +63,8 @@ $userid = bigintval(getRequestParameter('userid'));
 $chk = bigintval(getRequestParameter('check'), false);
 
 // Check if link is not clicked so far
-$result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
+$result = SQL_QUERY_ESC("SELECT
+       b.points, d.userid, d.gender, d.surname, d.family, d.status, d.ref_payout
 FROM
        `{?_MYSQL_PREFIX?}_user_birthday` AS b
 INNER JOIN
@@ -71,9 +72,13 @@ INNER JOIN
 ON
        b.userid=d.userid
 WHERE
-       b.userid=%s AND b.chk_value='%s'
+       b.userid=%s AND
+       b.chk_value='%s'
 LIMIT 1",
-       array($userid, $chk), __FILE__, __LINE__);
+       array(
+               $userid,
+               $chk
+       ), __FILE__, __LINE__);
 //* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result).")<br />");
 
 // Prepare content
@@ -99,10 +104,6 @@ if (SQL_NUMROWS($result) == 1) {
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",
                        array($userid, $chk), __FILE__, __LINE__);
 
-               // "Translate" some data
-               $data['gender'] = translateGender($data['gender']);
-               $data['points'] = translateComma($data['points']);
-
                // Load message from template
                $content['message'] = loadTemplate('birthday_msg', true, $data);
        } else {