Rewrites/fixes

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

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 3bfc7d14f95b14a8bd23b422917e74cbf252bf67..dc7d2286883ee290feb15852ca161cb019a67b1a 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -73,28 +73,28 @@ WHERE
 LIMIT 1", array(getRequestParameter('hash')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Sponsor found, load his data...
-               $SPONSOR = SQL_FETCHARRAY($result);
+               $data = SQL_FETCHARRAY($result);
 
                // Translate gender and comma
-               $SPONSOR['gender']  = translateGender($SPONSOR['gender']);
-               $SPONSOR['points'] = translateComma($SPONSOR['points']);
-               $SPONSOR['pay']    = translateComma($SPONSOR['pay']);
+               $data['gender']  = translateGender($data['gender']);
+               $data['points'] = translateComma($data['points']);
+               $data['pay']    = translateComma($data['pay']);
 
                // Unconfirmed account or changed email address?
-               if ($SPONSOR['status'] == 'UNCONFIRMED') {
+               if ($data['status'] == 'UNCONFIRMED') {
                        // Set account to pending
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `status`='PENDING'
 WHERE `id`='%s' AND hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
-                       array(bigintval($SPONSOR['id']), getRequestParameter('hash')), __FILE__, __LINE__);
+                       array(bigintval($data['id']), getRequestParameter('hash')), __FILE__, __LINE__);
 
                        // Check on success
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Prepare mail and send it to the sponsor
-                               $message = loadEmailTemplate('sponsor_pending', $SPONSOR);
-                               sendEmail($SPONSOR['email'], getMessage('SPONSOR_ACCOUNT_PENDING_SUBJ'), $message);
+                               $message = loadEmailTemplate('sponsor_pending', $data);
+                               sendEmail($data['email'], getMessage('SPONSOR_ACCOUNT_PENDING_SUBJ'), $message);
 
                                // Send email to admin
-                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $SPONSOR);
+                               sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data);
 
                                // Sponsor account set to pending
                                loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_IS_PENDING'));
@@ -102,11 +102,18 @@ WHERE `id`='%s' AND hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
                                // Could not unlock account!
                                loadTemplate('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_PENDING_FAILED'));
                        }
-               } elseif ($SPONSOR['status'] == 'EMAIL') {
+               } elseif ($data['status'] == 'EMAIL') {
                        // Changed email adress need to be confirmed
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `status`='CONFIRMED'
-WHERE `id`='%s' AND hash='%s' AND `status`='EMAIL' LIMIT 1",
-                       array(bigintval($SPONSOR['id']), getRequestParameter('hash')), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_sponsor_data`
+SET
+       `status`='CONFIRMED'
+WHERE
+       `id`='%s' AND
+       `hash`='%s' AND
+       `status`='EMAIL'
+LIMIT 1",
+                               array(bigintval($data['id']), getRequestParameter('hash')), __FILE__, __LINE__);
 
                        // Check on success
                        if (SQL_AFFECTEDROWS() == 1) {
@@ -144,19 +151,19 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Unconfirmed sponsor account found so let's load the requested data
-                       $SPONSOR = SQL_FETCHARRAY($result);
+                       $data = SQL_FETCHARRAY($result);
 
                        // Translate some data
-                       $SPONSOR['gender']           = translateGender($SPONSOR['gender']);
-                       $SPONSOR['sponsor_created'] = generateDateTime($SPONSOR['sponsor_created']);
+                       $data['gender']          = translateGender($data['gender']);
+                       $data['sponsor_created'] = generateDateTime($data['sponsor_created']);
 
                        // Prepare email and send it to the sponsor
-                       if ($SPONSOR['status'] == 'UNCONFIRMED') {
+                       if ($data['status'] == 'UNCONFIRMED') {
                                // Unconfirmed accounts
-                               $message_sponsor = loadEmailTemplate('sponsor_activate', $SPONSOR);
+                               $message_sponsor = loadEmailTemplate('sponsor_activate', $data);
                        } else {
                                // Confirmed email address
-                               $message_sponsor = loadEmailTemplate('sponsor_email', $SPONSOR);
+                               $message_sponsor = loadEmailTemplate('sponsor_email', $data);
                        }
                        sendEmail(postRequestParameter('email'), getMessage('SPONSOR_ACTIVATION_LINK_SUBJ'), $message_sponsor);
 
@@ -193,7 +200,7 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1",
                        $DATA = SQL_FETCHARRAY($result);
 
                        // Translate some data
-                       $DATA['gender']           = translateGender($DATA['gender']);
+                       $DATA['gender']          = translateGender($DATA['gender']);
                        $DATA['sponsor_created'] = generateDateTime($DATA['sponsor_created']);
 
                        // Generate password