More misc fixes and rewrites (sorry, lame description)

[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 d790166aff675bbac38d62e49852a1c7e2ae57c1..12dace12c630e44d964ea8d149cca712a3d98042 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -60,10 +60,10 @@ if (REQUEST_ISSET_GET('hash')) {
                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__);
                if (SQL_AFFECTEDROWS() == 1) {
-                       $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
+                       $message = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
                        // And send him right away the confirmation mail
-                       sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $msg);
+                       sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
 
                        // Maybe he got "referaled"?
                        if (($rid > 0) && ($rid != $uid)) {
@@ -98,7 +98,7 @@ if (REQUEST_ISSET_GET('hash')) {
 
                                        // Add one-time referal bonus over referal system or directly
                                        unset($GLOBALS['ref_level']);
-                                       ADD_POINTS_REFSYSTEM("referal_bonus", $rid, getConfig('points_ref'), true, bigintval($uid), $locked, getConfig('reg_points_mode'));
+                                       ADD_POINTS_REFSYSTEM('referal_bonus', $rid, getConfig('points_ref'), true, bigintval($uid), $locked, getConfig('reg_points_mode'));
                                } // END - if
                        } // END - if
 
@@ -113,18 +113,18 @@ if (REQUEST_ISSET_GET('hash')) {
                                setSession('lead_uid', bigintval($uid));
 
                                // Lead-Code mode enabled
-                               redirectToUrl("lead-confirm.php");
+                               redirectToUrl('lead-confirm.php');
                        } else {
                                define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_DONE'));
                                define('__UID', bigintval($uid));
-                               LOAD_TEMPLATE("guest_confirm_table");
+                               LOAD_TEMPLATE('guest_confirm_table');
                        }
                } elseif (EXT_IS_ACTIVE('lead')) {
                        // Set special lead cookie
                        setSession('lead_uid', bigintval($uid));
 
                        // Lead-Code mode enabled
-                       redirectToUrl("lead-confirm.php");
+                       redirectToUrl('lead-confirm.php');
                } else {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?
                        define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
@@ -138,17 +138,16 @@ if (REQUEST_ISSET_GET('hash')) {
                LOAD_TEMPLATE('guest_confirm_table');
        }
 } 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",
+       // 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__);
        if (SQL_NUMROWS($result) == 1) {
                // Email address found
                $DATA = SQL_FETCHROW($result);
-               switch ($DATA[1])
-               {
+               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);
+                               $message = LOAD_EMAIL_TEMPLATE('guest_request_confirm', array('hash' => $DATA[2]), $DATA[0]);
+                               sendEmail(REQUEST_POST('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
                                $content = getMessage('CONFIRM_LINK_SENT');
                                break;
 
@@ -159,17 +158,17 @@ if (REQUEST_ISSET_GET('hash')) {
                        case 'LOCKED': // Account is locked
                                $content = getMessage('LOGIN_ID_LOCKED');
                                break;
-               }
+               } // END - switch
        } else {
                // Email address not registered
                $content = getMessage('EMAIL_ADDY_404');
        }
 
        define('__CONFIRM_MSG', $content);
-       LOAD_TEMPLATE("guest_confirm_table");
+       LOAD_TEMPLATE('guest_confirm_table');
 } else {
        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
-       LOAD_TEMPLATE("guest_confirm_link");
+       LOAD_TEMPLATE('guest_confirm_link');
 }
 
 //