Way more usage of EL code:

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index b06b0c71d17741272935231faa1137c32fe0cca4..8619fc7056b819e703e7769695f5394a526469b5 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -64,16 +62,16 @@ $chk = bigintval(getRequestParameter('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
 INNER JOIN
        `{?_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,
@@ -91,14 +89,10 @@ if (SQL_NUMROWS($result) == 1) {
 
        // Is the account confirmed?
        if ($data['status'] == 'CONFIRMED') {
-               // Set mode depending on how many mails the member has to confirm
-               $locked = false;
-               if (($data['ref_payout'] > 0) && (getConfig('allow_direct_pay') != 'Y')) $locked = true;
-
                // Add points to account
                // @TODO Try to rewrite the following unset()
                unset($GLOBALS['ref_level']);
-               addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points'], false, 0, $locked, strtolower(getConfig('birthday_mode')));
+               addPointsThroughReferalSystem('birthday_confirm', $userid, $data['points'], false, 0, strtolower(getConfig('birthday_mode')));
 
                // Remove entry from table
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_birthday` WHERE `userid`=%s AND `chk_value`='%s' LIMIT 1",
@@ -108,11 +102,11 @@ if (SQL_NUMROWS($result) == 1) {
                $content['message'] = loadTemplate('birthday_msg', true, $data);
        } else {
                // Unconfirmed / locked accounts cannot get points
-               $content['message'] = getMaskedMessage('BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
+               $content['message'] = '{%message,MEMBER_BIRTHDAY_CANNOT_STATUS=' . $data['status'] . '%}';
        }
 } else {
        // Cannot load data!
-       $content['message'] = getMessage('BIRTHDAY_CANNOT_LOAD_DATA');
+       $content['message'] = '{--MEMBER_BIRTHDAY_CANNOT_LOAD_DATA--}';
 }
 
 // Free memory