New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 579b138ad5f8fa202d7f7e8b47cec44847000f77..f2259d1bfe8d8fb1750b107d2f0c15c7f932f7c3 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -71,7 +71,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        $DATA['url'] = COMPILE_CODE($DATA['url']);
 
                        // Message is active in queue
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='QUEUE' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='QUEUE' WHERE `id`=%s LIMIT 1",
                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
                        // "Explode" all receivers into an array
@@ -83,7 +83,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                $RECEIVERS = array($DATA['receivers']);
                        } else {
                                // No users left
-                               $RECEIVERS = array("0");
+                               $RECEIVERS = array('0');
                        }
                        $dummy = $RECEIVERS;
 
@@ -91,7 +91,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        // We can now send mails to them...
                        foreach ($RECEIVERS as $key => $uid) {
                                // Load personal data
-                               //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
+                               //* DEBUG: */ echo "*L:".__LINE__.'/'.$uid."*<br />";
                                $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                        array(bigintval($uid)), __FILE__, __LINE__);
 
@@ -102,7 +102,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                        //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
-                                       if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == "done") {
+                                       if (removeReceiver($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == 'done') {
                                                // Replace text variables
                                                foreach ($GLOBALS['replacer'] as $key => $value) {
                                                        if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
@@ -112,9 +112,9 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                                $content = array(
                                                        'id'       => $DATA['id'],
                                                        'url'      => $DATA['url'],
-                                                       'time'     => CREATE_FANCY_TIME($DATA['time']),
-                                                       'points'   => TRANSLATE_COMMA($DATA['points']),
-                                                       'category' => GET_CATEGORY($DATA['cat_id']),
+                                                       'time'     => createFancyTime($DATA['time']),
+                                                       'points'   => translateComma($DATA['points']),
+                                                       'category' => getCategory($DATA['cat_id']),
                                                        'text'     => $DATA['text']
                                                );
 
@@ -124,10 +124,10 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                                // Send mail away
                                                if (isset($DATA['html_msg'])) {
                                                        // Send HTML?
-                                                       SEND_EMAIL($email, $DATA['subject'], $mailText, $DATA['html_msg']);
+                                                       sendEmail($email, $DATA['subject'], $mailText, $DATA['html_msg']);
                                                } else {
                                                        // No HTML mail!
-                                                       SEND_EMAIL($email, $DATA['subject'], $mailText);
+                                                       sendEmail($email, $DATA['subject'], $mailText);
                                                }
 
                                                // Count one up and remove entry from dummy array
@@ -140,7 +140,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                                } // END - if
 
                                                // Do we have send maximum mails?
-                                               if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (SELECTION_COUNT($dummy) == 0)) {
+                                               if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (countSelection($dummy) == 0)) {
                                                        // Yes, we have
                                                        //* DEBUG: */ echo "*EXIT/L:".__LINE__."<br />";
                                                        break;
@@ -157,15 +157,15 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                // Update entry (or add missing
                                $P = $GLOBALS['pool_cnt'];
                                if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2;
-                               //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+<br />";
+                               //* DEBUG: */ echo "+MEDIA/L:".__LINE__.'/'.$P."+<br />";
                                MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), 'add', $P);
                        } // END - if
 
                        // Close sending system
-                       //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
-                       if (SELECTION_COUNT($dummy) == 0) {
+                       //* DEBUG: */ echo "-L:".__LINE__.'/'.countSelection($dummy)."-<br />";
+                       if (countSelection($dummy) == 0) {
                                // Queue reached!
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1",
                                        array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
@@ -177,8 +177,8 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                } // END - if
                        } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
                                // Update bonus pool
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
-                                       array(SELECTION_COUNT($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET `data_type`='NEW', `target_send`=%s, `receivers`='%s' WHERE `id`=%s LIMIT 1",
+                                       array(countSelection($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<pre>";
                                //* DEBUG: */ print_r($dummy);
                                //* DEBUG: */ echo "</pre>\n!!!<br />";