X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=c10638afb4048489e672ffca143f21db8aae57c2;hb=4e47eb8b83ed2fcd4320aeed8b8c460eb1c8fe4b;hp=a0b400076eaf25df527ae808ccf639ea824df2b0;hpb=06a24901c58897845bafc1e5b428fee99024bc64;p=mailer.git
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index a0b400076e..c10638afb4 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -55,10 +55,10 @@ if (isResetModeEnabled()) {
// Check for freed mail orders to send out
if (EXT_IS_ACTIVE('html_mail')) {
// 0 1 2 3 4 5 6 7 8 9 10
- $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{!_MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+ $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{!_MYSQL_PREFIX!}_pool` WHERE `data_type`='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
} else {
// 0 1 2 3 4 5 6 7 8 9 10
- $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM `{!_MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+ $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM `{!_MYSQL_PREFIX!}_pool` WHERE `data_type`='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
}
// Reset variables
@@ -67,8 +67,8 @@ if (SQL_NUMROWS($result_main) > 0) {
// Parse all mails
while ($DATA = SQL_FETCHROW($result_main)) {
// Set mail order as 'active'. That means it will be sent out
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='ACTIVE' WHERE `id`=%s AND data_type='NEW' LIMIT 1",
- array($DATA[0]), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET `data_type`='ACTIVE' WHERE `id`=%s AND `data_type`='NEW' LIMIT 1",
+ array($DATA[0]), __FILE__, __LINE__);
// Check fetched data for HTML
$HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = 'N';
@@ -96,10 +96,10 @@ if (SQL_NUMROWS($result_main) > 0) {
foreach ($RECEIVERS as $key => $uid) {
// Lookup user ID
$result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
+ array(bigintval($uid)), __FILE__, __LINE__);
// Is his data available?
- //* DEBUG: */ echo "*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*
";
+ //* DEBUG: */ OUTPUT_HTML("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*
");
if (SQL_NUMROWS($result_user) == 1) {
// The final receiver does exists so we can continue...
list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
@@ -109,29 +109,28 @@ if (SQL_NUMROWS($result_main) > 0) {
// Do we have a stats entry?
$result_stats = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
- array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
+ array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
// If there's no stats entry add it!
- //* DEBUG: */ echo "!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
";
+ //* DEBUG: */ OUTPUT_HTML("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
");
if (SQL_NUMROWS($result_stats) == 0) {
// No entry was found, so we add him!
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats` (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())",
- array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
+ array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
// Receive it's ID for the links table
$result_stats = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
- array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
+ array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
} // END - if
- //* DEBUG: */ echo "!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
";
+ //* DEBUG: */ OUTPUT_HTML("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
");
if (SQL_NUMROWS($result_stats) == 1) {
// We got one!
list($stats_id) = SQL_FETCHROW($result_stats);
// Mark this user as "spammed" ;-) And place a line for him...
- //* DEBUG: */ echo "?L:".__LINE__.'/'.$dummy.'/'.$key.'/'.$uid.'('.$DATA[1].")/".$DATA[0].'/'.$stats_id."?
";
- switch (removeReceiver($dummy, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id)))
- {
+ //* DEBUG: */ OUTPUT_HTML("?L:".__LINE__.'/'.$dummy.'/'.$key.'/'.$uid.'('.$DATA[1].")/".$DATA[0].'/'.$stats_id."?
");
+ switch (removeReceiver($dummy, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id))) {
case 'done':
// Prepare the mail
$DATA[11] = bigintval($stats_id);
@@ -163,36 +162,36 @@ if (SQL_NUMROWS($result_main) > 0) {
// Count sent mails...
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET emails_sent=emails_sent+1 WHERE userid=%s LIMIT 1",
- array(bigintval($DATA[1])), __FILE__, __LINE__);
+ array(bigintval($DATA[1])), __FILE__, __LINE__);
if (GET_EXT_VERSION('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__);
+ array(bigintval($uid)), __FILE__, __LINE__);
} // END - if
// Update mediadata if version is 0.0.4 or higher
if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
// Update entry (or add missing)
- //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*
";
+ //* DEBUG: */ OUTPUT_HTML("*MEDIA/L:".__LINE__."*
");
MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), 'add', 1);
} // END - if
// And count up the mail
$GLOBALS['pool_cnt']++;
- //* DEBUG: */ echo"*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."*
";
+ //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."*
");
break;
case 'already':
// Entry already found, but we still count one up!
$GLOBALS['pool_cnt']++;
- //* DEBUG: */ echo"*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."
";
+ //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."
");
break;
}
}
// Do we have reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
- //* DEBUG: */ echo "*L:".__LINE__.'/'.$GLOBALS['pool_cnt'].">=".$DATA[8].'/'.getConfig('max_send').">=".$GLOBALS['pool_cnt'].'/'.$lastSentId."!=".$DATA[0]."*
";
+ //* DEBUG: */ OUTPUT_HTML("*L:".__LINE__.'/'.$GLOBALS['pool_cnt'].">=".$DATA[8].'/'.getConfig('max_send').">=".$GLOBALS['pool_cnt'].'/'.$lastSentId."!=".$DATA[0]."*
");
if ((($GLOBALS['pool_cnt'] >= $DATA[8])) && ($lastSentId != $DATA[0])) {
// Prepare content
$content = array(
@@ -208,7 +207,7 @@ if (SQL_NUMROWS($result_main) > 0) {
// Get sender's data
$result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
- array(bigintval($DATA[1])), __FILE__, __LINE__);
+ array(bigintval($DATA[1])), __FILE__, __LINE__);
// Is the sender found?
if (SQL_NUMROWS($result_sender) == 1) {
@@ -227,11 +226,11 @@ if (SQL_NUMROWS($result_main) > 0) {
// Set status to SEND because we completely send it away
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1",
- array(bigintval($DATA[0])), __FILE__, __LINE__);
+ array(bigintval($DATA[0])), __FILE__, __LINE__);
// Update send-completed-time
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
- array(bigintval($DATA[0])), __FILE__, __LINE__);
+ array(bigintval($DATA[0])), __FILE__, __LINE__);
$lastSentId = $DATA[0]; $GLOBALS['pool_cnt'] = 0;
$cnt2 += $GLOBALS['pool_cnt'];
@@ -239,11 +238,11 @@ if (SQL_NUMROWS($result_main) > 0) {
// Update mediadata if version is 0.0.4 or higher
if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
// Update entry (or add missing)
- //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*
";
+ //* DEBUG: */ OUTPUT_HTML("*MEDIA/L:".__LINE__."*
");
MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), 'add', 1);
} // END - if
- //* DEBUG: */ echo"*EXIT/L:".__LINE__.'/'.$P."
";
+ //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$P."
");
break;
}
// Do we have send maximum mails?
@@ -251,10 +250,10 @@ if (SQL_NUMROWS($result_main) > 0) {
// There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
$add = '';
if ($GLOBALS['pool_cnt'] <= $DATA[8]) $add = ", target_send=target_send-".$GLOBALS['pool_cnt'];
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW', receivers='%s'".$add." WHERE `id`=%s LIMIT 1",
- array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET `data_type`='NEW', receivers='%s'".$add." WHERE `id`=%s LIMIT 1",
+ array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
- //* DEBUG: */ echo"*EXIT/L:".__LINE__."*
";
+ //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__."*
");
break;
}
@@ -264,8 +263,8 @@ if (SQL_NUMROWS($result_main) > 0) {
// User does not exists so we have add the sender's points back to sender's account
if (($RECEIVERS[0] == '0') || (empty($RECEIVERS[0]))) {
// List was empty
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='SEND' WHERE `id`=%s LIMIT 1",
- array(bigintval($DATA[0])), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET `data_type`='SEND' WHERE `id`=%s LIMIT 1",
+ array(bigintval($DATA[0])), __FILE__, __LINE__);
} else {
// Is the userid set?
if ($uid > 0) {
@@ -286,7 +285,7 @@ if (SQL_NUMROWS($result_main) > 0) {
// Update receivers
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET receivers='%s' WHERE `id`=%s LIMIT 1",
- array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+ array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
}
}
}