X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fpool%2Fpool-bonus.php;h=6baa5b7705d1b567bb09f23b13274ebc5eb00802;hb=3fc95231ba85cc8c292b81bf502d4d7fab85ca8b;hp=0d93da0e2b41820f303c6c17de40bf84db4e02b4;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97;p=mailer.git
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 0d93da0e2b..6baa5b7705 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -1,7 +1,7 @@
0) {
// Send these mails away...
- $cnt2 = "";
+ $cnt2 = '';
while ($DATA = SQL_FETCHARRAY($result_bonus)) {
- // Compile URL
- $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
- if (ereg(";", $DATA['receivers'])) {
+ if (ereg(';', $DATA['receivers'])) {
// There's more than one receiver in the list...
- $RECEIVERS = explode(";", $DATA['receivers']);
+ $receiverS = explode(';', $DATA['receivers']);
} elseif (!empty($DATA['points'])) {
// Only one user left
- $RECEIVERS = array($DATA['receivers']);
+ $receiverS = array($DATA['receivers']);
} else {
// No users left
- $RECEIVERS = array("0");
+ $receiverS = array(0);
}
- $dummy = $RECEIVERS;
+ $dummy = $receiverS;
- // Now, if we are good little boys and girls Santa left us some user-ids.
+ // Now, if we are good little boys and girls Santa Claus left us some user-ids.
// We can now send mails to them...
- foreach ($RECEIVERS as $key => $uid) {
+ foreach ($receiverS as $key => $userid) {
// Load personal data
- //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*
";
- $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
-
- // Is his data available?
- if (SQL_NUMROWS($result_user) == 1) {
+ if (fetchUserData($userid)) {
// The final receiver does exists so we can continue...
- list($sname, $fname, $email) = SQL_FETCHROW($result_user);
- //* DEBUG: */ echo "OK!/L:".__LINE__."
";
+ //* DEBUG: */ print("OK!/L:".__LINE__."
");
// 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, $userid, $DATA['id'], $DATA['id'], true) == 'done') {
// Replace text variables
- foreach ($REPLACER as $key => $value) {
+ foreach ($GLOBALS['replacer'] as $key => $value) {
if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
} // END - foreach
@@ -106,76 +102,73 @@ 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']
);
// Prepare the mail
- $mailText = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid);
+ $mailText = loadEmailTemplate('bonus-mail', $content, $userid);
// Send mail away
if (isset($DATA['html_msg'])) {
// Send HTML?
- SEND_EMAIL($email, $DATA['subject'], $mailText, $DATA['html_msg']);
+ sendEmail(getUserData('email'), $DATA['subject'], $mailText, $DATA['html_msg']);
} else {
// No HTML mail!
- SEND_EMAIL($email, $DATA['subject'], $mailText);
+ sendEmail(getUserData('email'), $DATA['subject'], $mailText);
}
// Count one up and remove entry from dummy array
$GLOBALS['pool_cnt']++; unset($dummy[$key]);
- if (GET_EXT_VERSION("user") >= "0.1.4") {
+ if (getExtensionVersion('user') >= '0.1.4') {
// Update mails received for receiver
- SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
+ array(bigintval($userid)), __FILE__, __LINE__);
} // 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__."
";
+ //* DEBUG: */ print("*EXIT/L:".__LINE__."
");
break;
} // END - if
} // END - if
} // END - if
-
- // Free some memory
- SQL_FREERESULT($result_user);
- }
+ } // END - foreach
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+ if (getExtensionVersion('mediadata') >= '0.0.4') {
// Update entry (or add missing
$P = $GLOBALS['pool_cnt'];
if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2;
- //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+
";
- MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
+ //* DEBUG: */ print("+MEDIA/L:".__LINE__.'/'.$P."+
");
+ updateMediadataEntry(array('total_send', 'bonus_send'), 'add', $P);
} // END - if
// Close sending system
- //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-
";
- if (SELECTION_COUNT($dummy) == 0) {
+ //* DEBUG: */ print("-L:".__LINE__.'/'.countSelection($dummy)."-
");
+ 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",
- array(bigintval($DATA['id'])), __FILE__, __LINE__);
- //* DEBUG: */ echo "*L:".__LINE__."*
";
+ 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: */ print("*L:".__LINE__."*
");
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+ if (getExtensionVersion('mediadata') >= '0.0.4') {
// Update entry (or add missing)
- //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*
";
- MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
+ //* DEBUG: */ print("*MEDIA/L:".__LINE__."*
");
+ updateMediadataEntry(array('total_orders', 'bonus_orders'), 'add', 1);
} // 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__);
- //* DEBUG: */ echo "*L:".__LINE__."
"; - //* DEBUG: */ print_r($dummy); - //* DEBUG: */ echo "\n!!!
"); + //* DEBUG: */ print(print_r($dummy, true)); + //* DEBUG: */ print("\n!!!