Heavy rewrite:

[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 aa8d40d7d7d0e182c90b95d2d120e7ec9692eca7..d790166aff675bbac38d62e49852a1c7e2ae57c1 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -45,20 +45,20 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR('guest', __FILE__);
 
-if (REQUEST_ISSET_GET(('hash'))) {
+if (REQUEST_ISSET_GET('hash')) {
        // Initialize the user ID
        $uid = 0;
 
        // Search for an unconfirmed or confirmed account
        $result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
-               array(REQUEST_GET('hash')), __FILE__, __LINE__);
+       array(REQUEST_GET('hash')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
                list ($uid, $email, $rid) = SQL_FETCHROW($result);
 
                // Unlock his account (but only when it is on UNCONFIRMED!)
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
-                       array(getConfig('ref_payout'), REQUEST_GET('hash')), __FILE__, __LINE__);
+               array(getConfig('ref_payout'), REQUEST_GET('hash')), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
                        $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
@@ -69,7 +69,7 @@ if (REQUEST_ISSET_GET(('hash'))) {
                        if (($rid > 0) && ($rid != $uid)) {
                                // Select the referal userid
                                $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                                       array(bigintval($rid)), __FILE__, __LINE__);
+                               array(bigintval($rid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Update ref counter...
                                        updateReferalCounter($rid);
@@ -77,12 +77,12 @@ if (REQUEST_ISSET_GET(('hash'))) {
                                        // Ok, write the ref-points to this user and his parent-ref
                                        unset($GLOBALS['ref_level']);
 
-                                       // Shall I "pay" the referal points imidiately?
+                                       // Shall I 'pay' the referal points imidiately?
                                        if (getConfig('ref_payout') == '0') {
-                                               // Yes, "pay" it now
+                                               // Yes, 'pay' it now
                                                $locked = false;
                                        } else {
-                                               // No, "pay" it later
+                                               // No, 'pay' it later
                                                $locked = true;
                                        }
 
@@ -90,7 +90,7 @@ if (REQUEST_ISSET_GET(('hash'))) {
                                        if ((GET_EXT_VERSION('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
                                                // Add points (directly only!)
                                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",
-                                                       array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
+                                               array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
 
                                                // Subtract points from system
                                                BONUS_POINTS_HANDLER(getConfig('bonus_ref'));
@@ -108,7 +108,7 @@ if (REQUEST_ISSET_GET(('hash'))) {
                        } // END - if
 
                        // Account confirmed!
-                       if (defined('LEAD_CODE_ENABLED') && defined('LEAD_EXPIRY_TIME')) {
+                       if (EXT_IS_ACTIVE('lead')) {
                                // Set special lead cookie
                                setSession('lead_uid', bigintval($uid));
 
@@ -119,7 +119,7 @@ if (REQUEST_ISSET_GET(('hash'))) {
                                define('__UID', bigintval($uid));
                                LOAD_TEMPLATE("guest_confirm_table");
                        }
-               } elseif (defined('LEAD_CODE_ENABLED') && defined('LEAD_EXPIRY_TIME')) {
+               } elseif (EXT_IS_ACTIVE('lead')) {
                        // Set special lead cookie
                        setSession('lead_uid', bigintval($uid));
 
@@ -129,15 +129,15 @@ if (REQUEST_ISSET_GET(('hash'))) {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?
                        define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
                        define('__UID', '0');
-                       LOAD_TEMPLATE("guest_confirm_table");
+                       LOAD_TEMPLATE('guest_confirm_table');
                }
        } else {
                // Nobody was found unter this hash key... or our new member want's to confirm twice?
                define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
                define('__UID', '0');
-               LOAD_TEMPLATE("guest_confirm_table");
+               LOAD_TEMPLATE('guest_confirm_table');
        }
-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('email')))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST('email'))) {
        // Confirmation link requested      0     1         2
        $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
                array(REQUEST_POST('email')), __FILE__, __LINE__);
@@ -146,19 +146,19 @@ if (REQUEST_ISSET_GET(('hash'))) {
                $DATA = SQL_FETCHROW($result);
                switch ($DATA[1])
                {
-               case "UNCONFIRMED": // Account not confirmed
-                       $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
-                       sendEmail(REQUEST_POST('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $msg);
-                       $content = getMessage('CONFIRM_LINK_SENT');
-                       break;
-
-               case 'CONFIRMED': // Account already confirmed
-                       $content = getMessage('LOGIN_ID_CONFIRMED');
-                       break;
-
-               case "LOCKED": // Account is locked
-                       $content = getMessage('LOGIN_ID_LOCKED');
-                       break;
+                       case 'UNCONFIRMED': // Account not confirmed
+                               $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
+                               sendEmail(REQUEST_POST('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $msg);
+                               $content = getMessage('CONFIRM_LINK_SENT');
+                               break;
+
+                       case 'CONFIRMED': // Account already confirmed
+                               $content = getMessage('LOGIN_ID_CONFIRMED');
+                               break;
+
+                       case 'LOCKED': // Account is locked
+                               $content = getMessage('LOGIN_ID_LOCKED');
+                               break;
                }
        } else {
                // Email address not registered