A3H added, handling fixed:

[mailer.git] / inc / modules / guest / what-confirm.php

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 1121248be5ada1699a9be064fc6274e4e84de9cd..ad16f5ea30a7b7558c94643666705f2650a6dacd 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -47,7 +47,7 @@ addMenuDescription('guest', __FILE__);
 
 // Init content
 $content = array(
-       'message' => getMessage('GUEST_CONFIRMED_FAILED'),
+       'message' => '{--GUEST_CONFIRMED_FAILED--}',
        'userid'  => 0,
 );
 
@@ -88,7 +88,7 @@ LIMIT 1",
                        $message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
 
                        // And send him right away the confirmation mail
-                       sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
+                       sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
 
                        // Maybe he got "referaled"?
                        if (($refid > 0) && ($refid != $userid)) {
@@ -97,17 +97,8 @@ LIMIT 1",
                                        // Update ref counter...
                                        updateReferalCounter($refid);
 
-                                       // Shall I 'pay' the referal points imidiately?
-                                       if (getConfig('ref_payout') == '0') {
-                                               // Yes, 'pay' it now
-                                               $locked = false;
-                                       } else {
-                                               // No, 'pay' it later
-                                               $locked = true;
-                                       }
-
                                        // If version matches add ref bonus to refid's account
-                                       if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (getConfig('bonus_active') == 'Y')) {
+                                       if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
                                                // Add points (directly only!)
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
                                                        array(bigintval($refid)), __FILE__, __LINE__);
@@ -119,7 +110,7 @@ LIMIT 1",
                                        // Add one-time referal bonus over referal system or directly
                                        // @TODO Try to rewrite the following unset()
                                        unset($GLOBALS['ref_level']);
-                                       addPointsThroughReferalSystem('referal_bonus', $refid, getConfig('points_ref'), true, bigintval($userid), $locked, getConfig('reg_points_mode'));
+                                       addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), true, bigintval($userid), getConfig('reg_points_mode'));
                                } // END - if
                        } // END - if
 
@@ -136,7 +127,7 @@ LIMIT 1",
                                // Lead-Code mode enabled
                                redirectToUrl('lead-confirm.php');
                        } else {
-                               $content['message'] = getMessage('GUEST_CONFIRMED_DONE');
+                               $content['message'] = '{--GUEST_CONFIRMED_DONE--}';
                                $content['userid']  = bigintval($userid);
                        }
                } elseif (isExtensionActive('lead')) {
@@ -147,11 +138,11 @@ LIMIT 1",
                        redirectToUrl('lead-confirm.php');
                } else {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?
-                       $content['message'] = getMessage('GUEST_CONFIRMED_TWICE');
+                       $content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
                }
        } else {
                // Nobody was found unter this hash key... or our new member want's to confirm twice?
-               $content['message'] = getMessage('GUEST_CONFIRMED_TWICE');
+               $content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
        }
 
        // Load template
@@ -169,23 +160,23 @@ LIMIT 1",
                                $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
                                // Send email
-                               sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+                               sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
 
                                // And set message
-                               $content['message'] = getMessage('CONFIRM_LINK_SENT');
+                               $content['message'] = '{--CONFIRM_LINK_SENT--}';
                                break;
 
                        case 'CONFIRMED': // Account already confirmed
-                               $content['message'] = getMessage('LOGIN_ID_CONFIRMED');
+                               $content['message'] = '{--LOGIN_ID_CONFIRMED--}';
                                break;
 
                        case 'LOCKED': // Account is locked
-                               $content['message'] = getMessage('LOGIN_ID_LOCKED');
+                               $content['message'] = '{--LOGIN_ID_LOCKED--}';
                                break;
                } // END - switch
        } else {
                // Email address not registered
-               $content['message'] = getMessage('EMAIL_404');
+               $content['message'] = '{--EMAIL_404--}';
        }
 
        // Load template