Rewrites/fixes for handling config entries in SQLs

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index e60f59c985468c9d96f35dcd1971a3c889a2c33b..7b5bffac08891a8b1b4cd89e48acd5e35c8290e8 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -1,14 +1,14 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/03/2004 *
- * ===============                              Last change: 10/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/03/2004 *
+ * ===================                          Last change: 10/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : birthday_confirm.php                             *
  * -------------------------------------------------------------------- *
  * Short description : Birthday bonus confirmation link                 *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Geburtstagsgutschrift best&auml;tigen                *
+ * Kurzbeschreibung  : Geburtstagsgutschrift bestaetigen                *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -56,13 +57,14 @@ setContentType('text/html');
 redirectOnUninstalledExtension('birthday');
 
 // Script is installed so let's check for his confirmation link...
-$userid = bigintval(getRequestElement('userid'));
+$userid = bigintval(getRequestParameter('userid'));
 
 // Only allow numbers here...
-$chk = bigintval(getRequestElement('check'), false);
+$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
@@ -70,10 +72,14 @@ 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__);
-//* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestElement('check')).'/'.SQL_NUMROWS($result).")<br />");
+       array(
+               $userid,
+               $chk
+       ), __FILE__, __LINE__);
+//* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result).")<br />");
 
 // Prepare content
 $content = array();
@@ -98,15 +104,11 @@ 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 {
                // Unconfirmed / locked accounts cannot get points
-               $content['message'] = sprintf(getMessage('BIRTHDAY_CANNOT_STATUS'), translateUserStatus($data['status']));
+               $content['message'] = getMaskedMessage('BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
        }
 } else {
        // Cannot load data!