Minor cleanups/renaming

[mailer.git] / inc / pool / pool-bonus.php

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index cc404ca1f5127bba2664a95b5a65a58268fbb6f0..92c76082795553f990de4275e59a281cc2d4ccf8 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -64,18 +64,18 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
        if (!SQL_HASZERONUMS($result_bonus)) {
                // Send these mails away...
                $count2 = '';
-               while ($DATA = SQL_FETCHARRAY($result_bonus)) {
+               while ($mailData = SQL_FETCHARRAY($result_bonus)) {
                        // Message is active in queue
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='QUEUE' WHERE `id`=%s LIMIT 1",
-                               array(bigintval($DATA['id'])), __FILE__, __LINE__);
+                               array(bigintval($mailData['id'])), __FILE__, __LINE__);
 
                        // "Explode" all receivers into an array
-                       if (isInString(';', $DATA['receivers'])) {
+                       if (isInString(';', $mailData['receivers'])) {
                                // There's more than one receiver in the list...
-                               $receivers = explode(';', $DATA['receivers']);
-                       } elseif (!empty($DATA['points'])) {
+                               $receivers = explode(';', $mailData['receivers']);
+                       } elseif (!empty($mailData['points'])) {
                                // Only one user left
-                               $receivers = array($DATA['receivers']);
+                               $receivers = array($mailData['receivers']);
                        } else {
                                // No users left
                                $receivers = array(0);
@@ -91,21 +91,21 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
                                        //* DEBUG: */ debugOutput('OK!/L:'.__LINE__);
 
                                        // Remove receiver from list
-                                       $status = removeReceiver($dummy, $key, $userid, $DATA['id'], $DATA['id'], true);
+                                       $status = removeReceiver($dummy, $key, $userid, $mailData['id'], $mailData['id'], true);
 
                                        // Did it work?
                                        switch ($status) {
                                                case 'done': // Done!
                                                        // Prepare the mail
-                                                       $mailText = loadEmailTemplate('member_bonus_pool_normal', $DATA, $userid);
+                                                       $mailText = loadEmailTemplate('member_bonus_pool_normal', $mailData, $userid);
 
                                                        // Send mail away
-                                                       if (isset($DATA['html_msg'])) {
+                                                       if (isset($mailData['html_msg'])) {
                                                                // Send HTML?
-                                                               sendEmail(getUserData('email'), $DATA['subject'], $mailText, $DATA['html_msg']);
+                                                               sendEmail(getUserData('userid'), $mailData['subject'], $mailText, $mailData['html_msg']);
                                                        } else {
                                                                // No HTML mail!
-                                                               sendEmail(getUserData('email'), $DATA['subject'], $mailText);
+                                                               sendEmail(getUserData('userid'), $mailData['subject'], $mailText);
                                                        }
 
                                                        // Count one up and remove entry from dummy array
@@ -126,7 +126,7 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
                                                        break;
 
                                                default: // Unknown return type
-                                                       logDebugMessage(__FILE__, __LINE__, 'Unknown status ' . $status . ' detected. pool_id=' . $DATA['id'] . ',userid=' . $DATA['userid'] . ',stats_id=' . $stats_id);
+                                                       logDebugMessage(__FILE__, __LINE__, 'Unknown status ' . $status . ' detected. pool_id=' . $mailData['id'] . ',userid=' . $mailData['userid'] . ',stats_id=' . $stats_id);
                                                        break;
                                        } // END - switch
                                } // END - if
@@ -154,7 +154,7 @@ SET
 WHERE
        `id`=%s
 LIMIT 1",
-                                       array(bigintval($DATA['id'])), __FILE__, __LINE__);
+                                       array(bigintval($mailData['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ debugOutput('*L:'.__LINE__.'*');
 
                                // Update mediadata if version is 0.0.4 or higher
@@ -177,7 +177,7 @@ LIMIT 1",
                                        array(
                                                countSelection($dummy),
                                                implode(';', $dummy),
-                                               bigintval($DATA['id'])
+                                               bigintval($mailData['id'])
                                        ), __FILE__, __LINE__);
                                //* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($dummy, true).'</pre>!!!');
                                break;