X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=eae45bc0e45da7487bc60af0d1e9dd7ba10db9bf;hp=83032754aaa984f6f3b02368d5040088563817b5;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 83032754aa..eae45bc0e4 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -116,7 +116,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 				// Lookup user id
 				//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
 				if (fetchUserData($userid)) {
-					// Do we have a stats entry?
+					// Is there 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($mailData['id'], $mailData['sender_userid'], $mailData['timestamp']), __FILE__, __LINE__);
 
@@ -178,8 +178,8 @@ if (!SQL_HASZERONUMS($result_main)) {
 								$mailData['stats_id'] = bigintval($stats_id);
 
 								// Prepare content
-								$mailData['time']   = getPaymentPoints($mailData['payment_id'], 'time');
-								$mailData['points'] = getPaymentPoints($mailData['payment_id'], 'payment');
+								$mailData['time']   = getPaymentData($mailData['payment_id'], 'time');
+								$mailData['points'] = getPaymentData($mailData['payment_id'], 'payment');
 
 								// Load message template
 								$mailText = loadEmailTemplate('member_user_pool_normal', $mailData, bigintval($userid));
@@ -221,7 +221,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 						} // END - switch
 					} // END - if
 
-					// Do we have reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
+					// Is there reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
 					//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getConfig('max_send').'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
 					if ((($GLOBALS['pool_cnt'] >= $mailData['target_send'])) && ($lastSentId != $mailData['id'])) {
 						// Prepare content
@@ -230,7 +230,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 							'cat_id'        => $mailData['cat_id'],
 							'text'          => $mailData['text'],
 							'url'           => $mailData['url'],
-							'expiration'    => '{%pipe,createFancyTime=' . getPaymentPoints($mailData['payment_id'], 'time') . '%}'
+							'expiration'    => '{%pipe,createFancyTime=' . getPaymentData($mailData['payment_id'], 'time') . '%}'
 						);
 
 						// Yes we do, so we notify admin and sender about fully sent mail!
@@ -266,7 +266,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 						//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$P);
 						break;
 					}
-					// Do we have send maximum mails?
+					// Is there send maximum mails?
 					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 = '';
@@ -293,7 +293,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 						// Is the userid set?
 						if (isValidUserId($userid)) {
 							// User does not exists, pay points back
-							$points = getPaymentPoints($mailData['payment_id']);
+							$points = getPaymentData($mailData['payment_id']);
 							initReferralSystem();
 							addPointsThroughReferralSystem('pool_payback', $mailData['sender_userid'], $points);
 
@@ -316,7 +316,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 		} // END - if
 	} // END - while
 
-	// Do we have points to "pay back"?
+	// Is there points to "pay back"?
 	if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
 		// Walk through all points
 		foreach ($pointsBack as $userid => $PB) {