X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=5ac55c5946c891e3680b287cb2ae0b1c9602f1da;hb=682edce003a1a91f66fb8e2212d7fdb591379843;hp=981c43d62e098349be589cac75fe026c6b42392a;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git
diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 981c43d62e..5ac55c5946 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -14,8 +14,6 @@
* $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 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -40,7 +38,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
// Don't run on daily reset
if (isResetModeEnabled()) {
@@ -62,8 +60,8 @@ if (isExtensionActive('html_mail')) {
}
// Reset variables
-$cnt2 = '0'; $lastSentId = '0'; $cnt_back = array(0); $pointsBack = array(0);
-if (SQL_NUMROWS($result_main) > 0) {
+$count2 = '0'; $lastSentId = '0'; $count_back = array(0); $pointsBack = array(0);
+if (!SQL_HASZERONUMS($result_main)) {
// Parse all mails
while ($DATA = SQL_FETCHARRAY($result_main, 0, false)) {
// Set mail order as 'active'. That means it will be sent out
@@ -75,7 +73,7 @@ if (SQL_NUMROWS($result_main) > 0) {
if (isset($DATA['html_msg'])) $HTML = $DATA['html_msg'];
// Entry updated?
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
// "Explode" all receivers into an array
if (isInString(';', $DATA['receivers'])) {
// There's more than one receiver in the list...
@@ -93,14 +91,14 @@ if (SQL_NUMROWS($result_main) > 0) {
// We can now send mails to them...
foreach ($receiverS as $key => $userid) {
// Lookup user id
- //* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*
");
+ //* 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['id'], $DATA['sender'], $DATA['timestamp']), __FILE__, __LINE__);
// If there's no stats entry add it!
- //* DEBUG: */ outputHtml("!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())",
@@ -111,20 +109,17 @@ if (SQL_NUMROWS($result_main) > 0) {
array(bigintval($DATA['id']), bigintval($DATA['sender']), bigintval($DATA['timestamp'])), __FILE__, __LINE__);
} // END - if
- //* DEBUG: */ outputHtml("!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: */ outputHtml("?L:".__LINE__.'/'.$dummy.'/'.$key.'/'.$userid.'('.['sender'].")/".$DATA['id'].'/'.$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['stats_id'] = bigintval($stats_id);
- $DATA['surname'] = getUserData('surname');
- $DATA['family'] = getUserData('family');
- $DATA['gender'] = translateGender(getUserData('gender'));
// Replace text variables
foreach ($GLOBALS['replacer'] as $key => $value) {
@@ -132,18 +127,11 @@ if (SQL_NUMROWS($result_main) > 0) {
} // END - if
// Prepare content
- $content = array(
- 'id' => $DATA['stats_id'],
- 'url' => $DATA['url'],
- 'sender_userid' => $DATA['sender'],
- 'category' => getCategory($DATA['cat_id']),
- 'time' => createFancyTime(getPaymentPoints($DATA['payment_id'], 'time')),
- 'points' => translateComma(getPaymentPoints($DATA['payment_id'], 'payment')),
- 'text' => $DATA['text']
- );
+ $DATA['time'] = getPaymentPoints($DATA['payment_id'], 'time');
+ $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment');
// Load message template
- $mailText = loadEmailTemplate('normal-mail', $content, bigintval($userid));
+ $mailText = loadEmailTemplate('normal-mail', $DATA, bigintval($userid));
// Send mail away
sendEmail(getUserData('email'), $DATA['subject'], $mailText, $HTML);
@@ -152,46 +140,46 @@ if (SQL_NUMROWS($result_main) > 0) {
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 (getExtensionVersion('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($userid)), __FILE__, __LINE__);
} // END - if
// Update mediadata if version is 0.0.4 or higher
- if (getExtensionVersion('mediadata') >= '0.0.4') {
+ if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update entry (or add missing)
- //* DEBUG: */ outputHtml("*MEDIA/L:".__LINE__."*
");
+ //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
updateMediadataEntry(array('total_send', 'normal_send'), 'add', 1);
} // END - if
// And count up the mail
$GLOBALS['pool_cnt']++;
- //* DEBUG: */ outputHtml("*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: */ outputHtml("*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: */ outputHtml("*L:".__LINE__.'/'.$GLOBALS['pool_cnt'].">=".$DATA['target_send'].'/'.getConfig('max_send').">=".$GLOBALS['pool_cnt'].'/'.$lastSentId."!=".$DATA['id']."*
");
+ //* 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_userid' => $DATA['sender'],
- 'category' => getCategory($DATA['cat_id']),
+ 'cat_id' => $DATA['cat_id'],
'text' => $DATA['text'],
'url' => $DATA['url'],
- 'expiration' => createFancyTime(getPaymentPoints($DATA['payment_id'], "time"))
+ 'expiration' => '{%pipe,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, $userid);
+ sendAdminNotification('{--ADMIN_SEND_DONE_SUBJECT--}', 'done-admin', $content, $userid);
// Get sender's data
if (fetchUserData($DATA['sender'])) {
@@ -199,7 +187,7 @@ if (SQL_NUMROWS($result_main) > 0) {
$mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
// Send it also waway
- sendEmail(getUserData('email'), getMessage('MEMBER_SUBJ_SEND_DONE'), $mailText);
+ sendEmail(getUserData('email'), '{--MEMBER_SEND_DONE_SUBJECT--}', $mailText);
} // END - if
// Set status to SEND because we completely send it away
@@ -211,27 +199,30 @@ if (SQL_NUMROWS($result_main) > 0) {
array(bigintval($DATA['id'])), __FILE__, __LINE__);
$lastSentId = $DATA['id']; $GLOBALS['pool_cnt'] = '0';
- $cnt2 += $GLOBALS['pool_cnt'];
+ $count2 += $GLOBALS['pool_cnt'];
// Update mediadata if version is 0.0.4 or higher
- if (getExtensionVersion('mediadata') >= '0.0.4') {
+ if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update entry (or add missing)
- //* DEBUG: */ outputHtml("*MEDIA/L:".__LINE__."*
");
+ //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
updateMediadataEntry(array('total_orders', 'normal_orders'), 'add', 1);
} // END - if
- //* DEBUG: */ outputHtml("*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'))) {
+ elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($count2 >= 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['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__);
+ 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: */ outputHtml("*EXIT/L:".__LINE__."*
");
+ //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'*');
break;
}
@@ -245,7 +236,7 @@ if (SQL_NUMROWS($result_main) > 0) {
array(bigintval($DATA['id'])), __FILE__, __LINE__);
} else {
// Is the userid set?
- if ($userid > 0) {
+ if (isValidUserId($userid)) {
// User does not exists, pay points back
$points = getPaymentPoints($DATA['payment_id']);
addPointsDirectly('pool_payback', $DATA['sender'], $points);
@@ -255,7 +246,7 @@ if (SQL_NUMROWS($result_main) > 0) {
} // END - if
// Count up
- $cnt_back[$DATA['sender']]++;
+ $count_back[$DATA['sender']]++;
}
// Remove entry from list
@@ -265,19 +256,19 @@ if (SQL_NUMROWS($result_main) > 0) {
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 $userid => $PB) {
// Add points only when we have points left to add and a valid user id
- if (($PB > 0) && ($userid > 0)) {
+ if (($PB > 0) && (isValidUserId($userid))) {
// Prepare content
$content = array(
- 'points' => translateComma($PB)
+ 'points' => $PB
);
// We have to pay back some points to the sender (we add them directly :-P)
@@ -286,18 +277,18 @@ if (SQL_NUMROWS($result_main) > 0) {
$mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
// Send mail out to member
- sendEmail(getUserData('email'), getMessage('MEMBER_BACK_JACKPOT') . ' (' . $userid . ')', $mailText);
+ sendEmail(getUserData('email'), '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
} elseif (isExtensionActive('jackpot')) {
// Add to jackpot
addPointsToJackpot($PB);
// Send mail out to admin
- sendAdminNotification(getMessage('ADMIN_BACK_JACKPOT') . ' (' . $userid . ')', 'back-admin', $content, 'admin');
+ sendAdminNotification('{--ADMIN_BACK_JACKPOT--}' . ' (' . $userid . ')', 'back-admin', $content, 'admin');
}
} // END - if
} // END - foreach
} // END - if
-}
+} // END - if
// Free memory
SQL_FREERESULT($result_main);
@@ -305,5 +296,5 @@ SQL_FREERESULT($result_main);
// Remove variable
unset($mailText);
-//
+// [EOF]
?>