X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=85388e456af990a41a4b0665566a3ff4dc8506de;hp=80fc955451411762e6d4b83ec048433936d73bd5;hb=fc162164725588cf75969f707faead9c9cd8e68b;hpb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 80fc955451..85388e456a 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -1,7 +1,7 @@
0) {
// Parse all mails
- while ($DATA = SQL_FETCHROW($result_main)) {
+ while ($DATA = SQL_FETCHARRAY($result_main, 0, false)) {
// 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['id']), __FILE__, __LINE__);
// Check fetched data for HTML
- $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = 'N';
-
- // Compile URL and subject line
- $DATA[7] = COMPILE_CODE($DATA[7]);
+ $HTML = 'N';
+ if (isset($DATA['html_msg'])) $HTML = $DATA['html_msg'];
// Entry updated?
if (SQL_AFFECTEDROWS() == 1) {
// "Explode" all receivers into an array
- if (ereg(';', $DATA[4])) {
+ if (isInString(';', $DATA['receivers'])) {
// There's more than one receiver in the list...
- $RECEIVERS = explode(';', $DATA[4]);
- } elseif (!empty($DATA[4])) {
+ $receiverS = explode(';', $DATA['receivers']);
+ } elseif (!empty($DATA['receivers'])) {
// Only one user left
- $RECEIVERS = array($DATA[4]);
+ $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) {
- // 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__);
-
- // Is his data available?
- //* 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);
-
- // Free memory
- SQL_FREERESULT($result_user);
-
+ foreach ($receiverS as $key => $userid) {
+ // Lookup user id
+ //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
+ if (fetchUserData($userid)) {
// 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__);
+ $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['id'], $DATA['sender'], $DATA['timestamp']), __FILE__, __LINE__);
// If there's no stats entry add it!
- //* DEBUG: */ OUTPUT_HTML("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
");
+ //* DEBUG: */ debugOutput('!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__);
+ 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['id']), bigintval($DATA['sender']), bigintval($DATA['cat_id']), bigintval($DATA['payment_id']), $DATA['subject'], $DATA['url'], $DATA['target_send'], bigintval($DATA['timestamp'])), __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__);
+ // 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['id']), bigintval($DATA['sender']), bigintval($DATA['timestamp'])), __FILE__, __LINE__);
} // END - if
- //* DEBUG: */ OUTPUT_HTML("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
");
+ //* DEBUG: */ debugOutput('!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: */ 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))) {
+ //* DEBUG: */ debugOutput('?L:'.__LINE__.'/'.$dummy.'/'.$key.'/'.$userid.'('.['sender'].')/'.$DATA['id'].'/'.$stats_id.'?');
+ switch (removeReceiver($dummy, $key, bigintval($userid), bigintval($DATA['id']), bigintval($stats_id))) {
case 'done':
// Prepare the mail
- $DATA[11] = bigintval($stats_id);
- $DATA[12] = $sname;
- $DATA[13] = $fname;
- $DATA[14] = translateGender($gender);
+ $DATA['stats_id'] = bigintval($stats_id);
// Replace text variables
foreach ($GLOBALS['replacer'] as $key => $value) {
- if (isset($DATA[$key])) $DATA[3] = str_replace($value, $DATA[$key], $DATA[3]);
+ if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
} // END - if
// Prepare content
- $content = array(
- 'id' => $DATA[11],
- 'url' => $DATA[7],
- 'sender_uid' => $DATA[1],
- 'category' => getCategory($DATA[9]),
- 'time' => createFancyTime(getPaymentPoints($DATA[5], "time")),
- 'points' => translateComma(getPaymentPoints($DATA[5], "payment")),
- 'text' => $DATA[3]
- );
+ $DATA['time'] = getPaymentPoints($DATA['payment_id'], 'time');
+ $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment');
// Load message template
- $mailText = LOAD_EMAIL_TEMPLATE("normal-mail", $content, bigintval($uid));
+ $mailText = loadEmailTemplate('normal-mail', $DATA, bigintval($userid));
// Send mail away
- sendEmail($email, $DATA[2], $mailText, $HTML);
+ sendEmail(getUserData('email'), $DATA['subject'], $mailText, $HTML);
// 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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET emails_sent=emails_sent+1 WHERE `userid`=%s LIMIT 1",
+ array(bigintval($DATA['sender'])), __FILE__, __LINE__);
- if (GET_EXT_VERSION('user') >= '0.1.4') {
+ if (isExtensionInstalledAndNewer('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
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
+ if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update entry (or add missing)
- //* DEBUG: */ OUTPUT_HTML("*MEDIA/L:".__LINE__."*
");
- MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), 'add', 1);
+ //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
+ updateMediadataEntry(array('total_send', 'normal_send'), 'add', 1);
} // END - if
// And count up the mail
$GLOBALS['pool_cnt']++;
- //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."*
");
+ //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'*');
break;
case 'already':
// Entry already found, but we still count one up!
$GLOBALS['pool_cnt']++;
- //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."
");
+ //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$GLOBALS['pool_cnt']);
break;
}
}
// Do we have reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
- //* 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])) {
+ //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$DATA['target_send'].'/'.getConfig('max_send').'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$DATA['id'].'*');
+ if ((($GLOBALS['pool_cnt'] >= $DATA['target_send'])) && ($lastSentId != $DATA['id'])) {
// Prepare content
$content = array(
- 'sender_uid' => $DATA[1],
- 'category' => getCategory($DATA[9]),
- 'text' => $DATA[3],
- 'url' => $DATA[7],
- 'expiration' => createFancyTime(getPaymentPoints($DATA[5], "time"))
+ 'sender_userid' => $DATA['sender'],
+ 'category' => getCategory($DATA['cat_id']),
+ 'text' => $DATA['text'],
+ 'url' => $DATA['url'],
+ 'expiration' => createFancyTime(getPaymentPoints($DATA['payment_id'], "time"))
);
// Yes we do, so we notify admin and sender about fully sent mail!
- sendAdminNotification(getMessage('ADMIN_SUBJ_SEND_DONE'), 'done-admin', $content, $uid);
+ sendAdminNotification(getMessage('ADMIN_SUBJ_SEND_DONE'), 'done-admin', $content, $userid);
// 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__);
-
- // Is the sender found?
- if (SQL_NUMROWS($result_sender) == 1) {
- // Load data and prepare mail
- list($sname, $fname, $email) = SQL_FETCHROW($result_sender);
-
+ if (fetchUserData($DATA['sender'])) {
// Load email template
- $mailText = LOAD_EMAIL_TEMPLATE('done-member', $content, $DATA[1]);
+ $mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
// Send it also waway
- sendEmail($email, MEMBER_SUBJ_SEND_DONE, $mailText);
+ sendEmail(getUserData('email'), '{--MEMBER_SUBJ_SEND_DONE--}', $mailText);
} // END - if
- // Free result
- SQL_FREERESULT($result_sender);
-
// 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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1",
+ array(bigintval($DATA['id'])), __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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
+ array(bigintval($DATA['id'])), __FILE__, __LINE__);
- $lastSentId = $DATA[0]; $GLOBALS['pool_cnt'] = 0;
+ $lastSentId = $DATA['id']; $GLOBALS['pool_cnt'] = '0';
$cnt2 += $GLOBALS['pool_cnt'];
// Update mediadata if version is 0.0.4 or higher
- if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
+ if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update entry (or add missing)
- //* DEBUG: */ OUTPUT_HTML("*MEDIA/L:".__LINE__."*
");
- MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), 'add', 1);
+ //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
+ updateMediadataEntry(array('total_orders', 'normal_orders'), 'add', 1);
} // END - if
- //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__.'/'.$P."
");
+ //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$P);
break;
}
// Do we have send maximum mails?
elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($cnt2 >= getConfig('max_send'))) {
// 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__);
-
- //* DEBUG: */ OUTPUT_HTML("*EXIT/L:".__LINE__."*
");
+ if ($GLOBALS['pool_cnt'] <= $DATA['target_send']) $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['id'])
+ ), __FILE__, __LINE__);
+
+ //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'*');
break;
}
@@ -261,73 +232,65 @@ if (SQL_NUMROWS($result_main) > 0) {
SQL_FREERESULT($result_stats);
} else {
// User does not exists so we have add the sender's points back to sender's account
- if (($RECEIVERS[0] == '0') || (empty($RECEIVERS[0]))) {
+ if (($receiverS['id'] == '0') || (empty($receiverS['id']))) {
// 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['id'])), __FILE__, __LINE__);
} else {
// Is the userid set?
- if ($uid > 0) {
+ if ($userid > 0) {
// User does not exists, pay points back
- $points = getPaymentPoints($DATA[5]);
- ADD_POINTS_REFSYSTEM_DIRECT('pool_payback', $DATA[1], $points);
+ $points = getPaymentPoints($DATA['payment_id']);
+ addPointsDirectly('pool_payback', $DATA['sender'], $points);
// Add points together and remove user
- $pointsBack[$DATA[1]] += $points;
+ $pointsBack[$DATA['sender']] += $points;
} // END - if
// Count up
- $cnt_back[$DATA[1]]++;
+ $cnt_back[$DATA['sender']]++;
}
// Remove entry from list
unset($dummy[$key]);
// 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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `receivers`='%s' WHERE `id`=%s LIMIT 1",
+ array(implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
}
- }
- }
- }
+ } // END - foreach
+ } // END - if
+ } // END - while
// Do we have points to "pay back"?
if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
// Walk through all points
- foreach ($pointsBack as $uid => $PB) {
- // Add points only when we have points left to add and a valid user ID
- if (($PB > 0) && ($uid > 0)) {
+ foreach ($pointsBack as $userid => $PB) {
+ // Add points only when we have points left to add and a valid user id
+ if (($PB > 0) && ($userid > 0)) {
// Prepare content
$content = array(
- 'points' => translateComma($DATA[10])
+ 'points' => $PB
);
// We have to pay back some points to the sender (we add them directly :-P)
- $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
- $DATA[10] = $PB; $DATA[11] = $cnt_back[$uid];
-
- // User found?
- if (SQL_NUMROWS($result) == 1) {
- list($email) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
-
+ if (fetchUserData($userid)) {
// User account does exists, so we can safely pay back!
- $mailText = LOAD_EMAIL_TEMPLATE("back-member", $content, bigintval($uid));
+ $mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
// Send mail out to member
- sendEmail($email, getMessage('MEMBER_BACK_JACKPOT')." (".$uid.')', $mailText);
- } else {
+ sendEmail(getUserData('email'), '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
+ } elseif (isExtensionActive('jackpot')) {
// Add to jackpot
- ADD_JACKPOT($PB);
+ addPointsToJackpot($PB);
// Send mail out to admin
- sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT')." (".$uid.')', "back-admin", $content, 'admin');
+ sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT') . ' (' . $userid . ')', 'back-admin', $content, 'admin');
}
} // END - if
} // END - foreach
} // END - if
-}
+} // END - if
// Free memory
SQL_FREERESULT($result_main);
@@ -335,5 +298,5 @@ SQL_FREERESULT($result_main);
// Remove variable
unset($mailText);
-//
+// [EOF]
?>