Fixed also usage of previously renamed fields as they must be the same

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index f1193741f44e26e6a960320b0534daec9391e7e7..51c7c936295d4c320f133ece64f2b68a05c5b79a 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);
 
 // Set module
 $GLOBALS['__module']      = 'birthday_confirm';
@@ -58,20 +58,26 @@ redirectOnUninstalledExtension('birthday');
 $userid = bigintval(getRequestElement('userid'));
 
 // Only allow numbers here...
-$chk = bigintval(getRequestElement('check'), false);
+$chk = bigintval(getRequestElement('check'), FALSE);
 
 // Check if link is not clicked so far
 $result = SQL_QUERY_ESC("SELECT
-       b.`points`, d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`status`, d.`ref_payout`
+       `b`.`points`,
+       `d`.`userid`,
+       `d`.`gender`,
+       `d`.`surname`,
+       `d`.`family`,
+       `d`.`status`,
+       `d`.`ref_payout`
 FROM
-       `{?_MYSQL_PREFIX?}_user_birthday` AS b
+       `{?_MYSQL_PREFIX?}_user_birthday` AS `b`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       b.`userid`=d.`userid`
+       `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,
@@ -85,7 +91,7 @@ $content = array();
 // Is an entry there?
 if (SQL_NUMROWS($result) == 1) {
        // Ok, congratulation again! Here's your gift from us...
-       $data = SQL_FETCHARRAY($result, false);
+       $data = SQL_FETCHARRAY($result, FALSE);
 
        // Is the account confirmed?
        if ($data['status'] == 'CONFIRMED') {
@@ -98,7 +104,7 @@ if (SQL_NUMROWS($result) == 1) {
                        array($userid, $chk), __FILE__, __LINE__);
 
                // Load message from template
-               $content['message'] = loadTemplate('birthday_msg', true, $data);
+               $content['message'] = loadTemplate('birthday_msg', TRUE, $data);
        } else {
                // Unconfirmed / locked accounts cannot get points
                $content['message'] = '{%message,MEMBER_BIRTHDAY_CANNOT_STATUS=' . $data['status'] . '%}';
@@ -117,14 +123,8 @@ $GLOBALS['__module'] = 'birthday_confirm';
 // Include header
 loadIncludeOnce('inc/header.php');
 
-// Load birthday header template (for your banners, e.g.?)
-$content['header'] =  loadTemplate('birthday_header', true);
-
-// Load birthday footer template (for your banners, e.g.?)
-$content['footer'] =  loadTemplate('birthday_footer', true);
-
 // Load final template and output it
-loadTemplate('birthday_confirm', false, $content);
+loadTemplate('birthday_confirm', FALSE, $content);
 
 // Include footer
 loadIncludeOnce('inc/footer.php');