Naming convention, more usage of EL, new wrapper function introduced:

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 91d5f911c3068a2539ec0360f4bed9375ccb7881..818001a631e5da1fc2fdfeca24c7a6e2a53c2d13 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -91,14 +91,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 +104,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'] = getMaskedMessage('MEMBER_BIRTHDAY_CANNOT_STATUS', translateUserStatus($data['status']));
        }
 } else {
        // Cannot load data!
-       $content['message'] = '{--BIRTHDAY_CANNOT_LOAD_DATA--}';
+       $content['message'] = '{--MEMBER_BIRTHDAY_CANNOT_LOAD_DATA--}';
 }
 
 // Free memory