X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=1bc67ec2aa436caad11d90dc837e6f54ca88cfdd;hp=19e15b1531acd13e56e22f8a3a9bf1563e20c2ed;hb=b8aa17b98b99c27eafbdca0fa090bae63527da9a;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c
diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 19e15b1531..1bc67ec2aa 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Sendet freigegebene Bonus-Mails aus dem Pool *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,51 +38,52 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// Don't run on daily reset
-if (defined('__DAILY_RESET')) {
+if (isResetModeEnabled()) {
// Skip here
return false;
-} elseif (!EXT_IS_ACTIVE("bonus")) {
+} elseif (!EXT_IS_ACTIVE('bonus')) {
// Abort if extension bonus is not active
return false;
}
+// Need this here
// Only send bonus mail when bonus extension is active and maximum send-mails is not reached
-if ($cnt < getConfig('max_send')) {
+if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
// Do we need to send out bonus mails?
- if (EXT_IS_ACTIVE("html_mail")) {
- // 0 1 2 3 4 5 6 7 8 9 10 11
- $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, html_msg FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+ if (EXT_IS_ACTIVE('html_mail')) {
+ // 0 1 2 3 4 5 6 7 8 9 10 11
+ $result_bonus = SQL_QUERY("SELECT `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `html_msg` FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
} else {
- // 0 1 2 3 4 5 6 7 8 9 10
- $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+ // 0 1 2 3 4 5 6 7 8 9 10
+ $result_bonus = SQL_QUERY("SELECT `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send` FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
}
if (SQL_NUMROWS($result_bonus) > 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
- $result_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']);
} else {
// No users left
- $RECEIVERS = array("0");
+ $RECEIVERS = array('0');
}
$dummy = $RECEIVERS;
@@ -85,8 +91,8 @@ if ($cnt < getConfig('max_send')) {
// We can now send mails to them...
foreach ($RECEIVERS as $key => $uid) {
// 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",
+ //* 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?
@@ -96,9 +102,9 @@ if ($cnt < getConfig('max_send')) {
//* DEBUG: */ echo "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, $uid, $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,35 +112,35 @@ if ($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
- $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid);
+ $mailText = LOAD_EMAIL_TEMPLATE('bonus-mail', $content, $uid);
// Send mail away
if (isset($DATA['html_msg'])) {
// Send HTML?
- SEND_EMAIL($email, $DATA['subject'], $msg, $DATA['html_msg']);
+ sendEmail($email, $DATA['subject'], $mailText, $DATA['html_msg']);
} else {
// No HTML mail!
- SEND_EMAIL($email, $DATA['subject'], $msg);
+ sendEmail($email, $DATA['subject'], $mailText);
}
// Count one up and remove entry from dummy array
- $cnt++; unset($dummy[$key]);
+ $GLOBALS['pool_cnt']++; unset($dummy[$key]);
- if (GET_EXT_VERSION("user") >= "0.1.4") {
+ if (GET_EXT_VERSION('user') >= '0.1.4') {
// Update mails received for receiver
- $result = 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($uid)), __FILE__, __LINE__);
} // END - if
// Do we have send maximum mails?
- if (($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__."
";
break;
@@ -147,35 +153,35 @@ if ($cnt < getConfig('max_send')) {
}
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+ if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
// Update entry (or add missing
- $P = $cnt;
- if (!empty($cnt2) && empty($cnt)) $P = $cnt2;
- //* DEBUG: */ echo "+MEDIA/L:".__LINE__."/".$P."+
";
- MEDIA_UPDATE_ENTRY(array("total_send", "bonus_send"), "add", $P);
+ $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);
} // END - if
// Close sending system
- //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-
";
- if (SELECTION_COUNT($dummy) == 0) {
+ //* DEBUG: */ echo "-L:".__LINE__.'/'.countSelection($dummy)."-
";
+ if (countSelection($dummy) == 0) {
// Queue reached!
- $result_done = 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__);
+ 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__."*
";
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+ if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
// Update entry (or add missing)
//* DEBUG: */ echo "*MEDIA/L:".__LINE__."*
";
- MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), "add", 1);
+ MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders"), 'add', 1);
} // END - if
- } elseif ($cnt >= getConfig('max_send')) {
+ } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
// Update bonus pool
- $result_done = 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__."";
+ 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__."";
//* DEBUG: */ print_r($dummy);
- //* DEBUG: */ echo "
\n!!!
";
+ //* DEBUG: */ echo "\n!!!
";
break;
}
}
@@ -183,10 +189,10 @@ if ($cnt < getConfig('max_send')) {
// Free memory
SQL_FREERESULT($result_bonus);
-}
-// Remove message (IMPORTANT!)
-unset($msg);
+ // Remove variable
+ unset($mailText);
+}
//
?>