X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=282f73fa0bcbd6a46c4f8d95aed70fb06e9f9de9;hb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;hp=29e87ddafd5f9f0021ea25ea113222c8cbc084c0;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 29e87ddafd..282f73fa0b 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -1,7 +1,7 @@
0) {
// Parse all mails
while ($DATA = SQL_FETCHARRAY($result_main, 0, false)) {
@@ -84,39 +84,29 @@ if (SQL_NUMROWS($result_main) > 0) {
$RECEIVERS = array($DATA['receivers']);
} else {
// No users left
- $RECEIVERS = array('0');
+ $RECEIVERS = array(0);
}
$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 => $userid) {
- // 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($userid)), __FILE__, __LINE__);
-
- // Is his data available?
+ // Lookup user id
//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*
");
- if (SQL_NUMROWS($result_user) == 1) {
- // The final receiver does exists so we can continue...
- list($gender, $surname, $family, $email) = SQL_FETCHROW($result_user);
-
- // Free memory
- SQL_FREERESULT($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",
+ $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: */ outputHtml("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!
");
- if (SQL_NUMROWS($result_stats) == 0) {
+ 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())",
+ 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",
+ // 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
@@ -131,9 +121,9 @@ if (SQL_NUMROWS($result_main) > 0) {
case 'done':
// Prepare the mail
$DATA['stats_id'] = bigintval($stats_id);
- $DATA['surname'] = $surname;
- $DATA['family'] = $family;
- $DATA['gender'] = translateGender($gender);
+ $DATA['surname'] = getUserData('surname');
+ $DATA['family'] = getUserData('family');
+ $DATA['gender'] = translateGender(getUserData('gender'));
// Replace text variables
foreach ($GLOBALS['replacer'] as $key => $value) {
@@ -155,7 +145,7 @@ if (SQL_NUMROWS($result_main) > 0) {
$mailText = loadEmailTemplate('normal-mail', $content, bigintval($userid));
// Send mail away
- sendEmail($email, $DATA['subject'], $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",
@@ -203,24 +193,14 @@ if (SQL_NUMROWS($result_main) > 0) {
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['sender'])), __FILE__, __LINE__);
-
- // Is the sender found?
- if (SQL_NUMROWS($result_sender) == 1) {
- // Load data and prepare mail
- list($surname, $family, $email) = SQL_FETCHROW($result_sender);
-
+ if (fetchUserData($DATA['sender'])) {
// Load email template
$mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
// Send it also waway
- sendEmail($email, MEMBER_SUBJ_SEND_DONE, $mailText);
+ sendEmail(getUserData('email'), getMessage('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['id'])), __FILE__, __LINE__);
@@ -229,7 +209,7 @@ if (SQL_NUMROWS($result_main) > 0) {
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['id']; $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
@@ -292,7 +272,7 @@ if (SQL_NUMROWS($result_main) > 0) {
if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
// Walk through all points
foreach ($pointsBack as $userid => $PB) {
- // Add points only when we have points left to add and a valid user ID
+ // Add points only when we have points left to add and a valid user id
if (($PB > 0) && ($userid > 0)) {
// Prepare content
$content = array(
@@ -300,19 +280,12 @@ if (SQL_NUMROWS($result_main) > 0) {
);
// 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($userid)), __FILE__, __LINE__);
-
- // User found?
- if (SQL_NUMROWS($result) == 1) {
- // Get email
- list($email) = SQL_FETCHROW($result);
-
+ if (fetchUserData($userid)) {
// User account does exists, so we can safely pay back!
$mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
// Send mail out to member
- sendEmail($email, getMessage('MEMBER_BACK_JACKPOT') . ' (' . $userid . ')', $mailText);
+ sendEmail(getUserData('email'), getMessage('MEMBER_BACK_JACKPOT') . ' (' . $userid . ')', $mailText);
} elseif (isExtensionActive('jackpot')) {
// Add to jackpot
addPointsToJackpot($PB);
@@ -320,9 +293,6 @@ if (SQL_NUMROWS($result_main) > 0) {
// Send mail out to admin
sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT') . ' (' . $userid . ')', 'back-admin', $content, 'admin');
}
-
- // Free result
- SQL_FREERESULT($result);
} // END - if
} // END - foreach
} // END - if