X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=128d793eea663d566c30dfa225e20f7bab524949;hp=9fe3822ada72dd86be1c68122705393a3dce5037;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=a18efdcd57ba91893f0958a457b5c58639b135c3

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 9fe3822ada..128d793eea 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 // Don't run on daily reset
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
 	// Skip here
-	return false;
-} elseif (!isExtensionActive('user')) {
-	// Abort here if extension user is not active
-	return false;
+	return FALSE;
+} elseif ((!isExtensionActive('user')) || (!isExtensionActive('other'))) {
+	// Abort here if extension user/other are not active
+	return FALSE;
 }
 
 // No HTML is default
@@ -59,10 +59,18 @@ if (isExtensionActive('html_mail')) {
 } // END - if
 
 // Main query
-$result_main = SQL_QUERY("SELECT
-	`id`,`sender` AS `sender_userid`,`subject`,`text`,`receivers`,
-	`payment_id`,`timestamp`,`url`,`target_send`,`cat_id`
-	".$HTML."
+$result_main = sqlQuery("SELECT
+	`id`,
+	`sender` AS `sender_userid`,
+	`subject`,
+	`text`,
+	`receivers`,
+	`payment_id`,
+	`timestamp`,
+	`url`,
+	`target_send`,
+	`cat_id`
+	" . $HTML . "
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -76,19 +84,20 @@ $lastSentId = '0';
 $count_back = array(0);
 $pointsBack = array(0);
 
-if (!SQL_HASZERONUMS($result_main)) {
+if (!ifSqlHasZeroNumRows($result_main)) {
 	// Parse all mails
-	while ($mailData = SQL_FETCHARRAY($result_main, 0, false)) {
+	while ($mailData = sqlFetchArray($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($mailData['id']), __FILE__, __LINE__);
+		updatePoolDataById($mailData['id'], 'data_type', 'ACTIVE', NULL, " AND `data_type`='NEW'");
 
 		// Check fetched data for HTML
 		$isHtml = 'N';
-		if (isset($mailData['html_msg'])) $isHtml = $mailData['html_msg'];
+		if (isset($mailData['html_msg'])) {
+			$isHtml = $mailData['html_msg'];
+		} // END - if
 
 		// Entry updated?
-		if (!SQL_HASZEROAFFECTED()) {
+		if (!ifSqlHasZeroAffectedRows()) {
 			// "Explode" all receivers into an array
 			if (isInString(';', $mailData['receivers'])) {
 				// There's more than one receiver in the list...
@@ -106,17 +115,17 @@ if (!SQL_HASZERONUMS($result_main)) {
 			// We can now send mails to them...
 			foreach ($receivers as $key => $userid) {
 				// Lookup user id
-				//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
+				//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.sqlNumRows($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",
+					// Is there a stats entry?
+					$result_stats = sqlQueryEscaped("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__);
 
 					// If there's no stats entry add it!
-					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
-					if (SQL_HASZERONUMS($result_stats)) {
+					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
+					if (ifSqlHasZeroNumRows($result_stats)) {
 						// No entry was found, so we add him!
-						SQL_QUERY_ESC("INSERT INTO
+						sqlQueryEscaped("INSERT INTO
 	`{?_MYSQL_PREFIX?}_user_stats`
 (
 	`pool_id`,
@@ -151,14 +160,14 @@ if (!SQL_HASZERONUMS($result_main)) {
 							), __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",
+						$result_stats = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
 							array(bigintval($mailData['id']), bigintval($mailData['sender_userid']), bigintval($mailData['timestamp'])), __FILE__, __LINE__);
 					} // END - if
 
-					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
-					if (SQL_NUMROWS($result_stats) == 1) {
+					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
+					if (sqlNumRows($result_stats) == 1) {
 						// We got one!
-						list($stats_id) = SQL_FETCHROW($result_stats);
+						list($stats_id) = sqlFetchRow($result_stats);
 
 						// Remove receiver from list
 						$status = removeReceiver($temporaryReceivers, $key, bigintval($userid), bigintval($mailData['id']), bigintval($stats_id));
@@ -169,10 +178,6 @@ if (!SQL_HASZERONUMS($result_main)) {
 								// Prepare the mail
 								$mailData['stats_id'] = bigintval($stats_id);
 
-								// Prepare content
-								$mailData['time']   = getPaymentPoints($mailData['payment_id'], 'time');
-								$mailData['points'] = getPaymentPoints($mailData['payment_id'], 'payment');
-
 								// Load message template
 								$mailText = loadEmailTemplate('member_user_pool_normal', $mailData, bigintval($userid));
 
@@ -180,12 +185,12 @@ if (!SQL_HASZERONUMS($result_main)) {
 								sendEmail(getUserData('userid'), $mailData['subject'], $mailText, $isHtml);
 
 								// Count sent mails...
-								SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_sent`=`emails_sent`+1 WHERE `userid`=%s LIMIT 1",
+								sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_sent`=`emails_sent`+1 WHERE `userid`=%s LIMIT 1",
 									array(bigintval($mailData['sender_userid'])), __FILE__, __LINE__);
 
 								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",
+									sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
 										array(bigintval($userid)), __FILE__, __LINE__);
 								} // END - if
 
@@ -213,8 +218,8 @@ if (!SQL_HASZERONUMS($result_main)) {
 						} // END - switch
 					} // END - if
 
-					// Do we have 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'].'*');
+					// Is there reached the maximum to send mails? || (getMaxSend() >= $GLOBALS['pool_cnt'])
+					//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getMaxSend().'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
 					if ((($GLOBALS['pool_cnt'] >= $mailData['target_send'])) && ($lastSentId != $mailData['id'])) {
 						// Prepare content
 						$content = array(
@@ -222,7 +227,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,getPaymentTime,createFancyTime=' . $mailData['payment_id'] . '%}'
 						);
 
 						// Yes we do, so we notify admin and sender about fully sent mail!
@@ -238,11 +243,10 @@ if (!SQL_HASZERONUMS($result_main)) {
 						} // END - if
 
 						// 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($mailData['id'])), __FILE__, __LINE__);
+						updatePoolDataById($mailData['id'], NULL, array('data_type' => 'SEND', 'target_send' => '0', 'receivers' => ''));
 
 						// Update send-completed-time
-						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
+						sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
 							array(bigintval($mailData['id'])), __FILE__, __LINE__);
 
 						$lastSentId = $mailData['id']; $GLOBALS['pool_cnt'] = '0';
@@ -258,39 +262,33 @@ if (!SQL_HASZERONUMS($result_main)) {
 						//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$P);
 						break;
 					}
-					// Do we have send maximum mails?
-					elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($count2 >= getConfig('max_send'))) {
+					// Is there send maximum mails?
+					elseif (($GLOBALS['pool_cnt'] >= getMaxSend()) || ($count2 >= getMaxSend())) {
 						// 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'] <= $mailData['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(';', $temporaryReceivers),
-								bigintval($mailData['id'])
-							), __FILE__, __LINE__);
+						if ($GLOBALS['pool_cnt'] <= $mailData['target_send']) $add = ',`target_send`=`target_send`-' . $GLOBALS['pool_cnt'];
+						updatePoolDataById($mailData['id'], NULL, array('data_type' => 'NEW', 'receivers' => implode(';', $temporaryReceivers)), NULL, '', $add);
 
 						//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'*');
 						break;
 					}
 
 					// Free result
-					SQL_FREERESULT($result_stats);
+					sqlFreeResult($result_stats);
 				} else {
 					// User does not exists so we have add the sender's points back to sender's account
 					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($mailData['id'])), __FILE__, __LINE__);
+						updatePoolDataById($mailData['id'], 'data_type', 'SEND');
 					} else {
 						// Is the userid set?
-						if (isValidUserId($userid)) {
+						if (isValidId($userid)) {
 							// User does not exists, pay points back
-							$points = getPaymentPoints($mailData['payment_id']);
 							initReferralSystem();
-							addPointsThroughReferralSystem('pool_payback', $mailData['sender_userid'], $points);
+							addPointsThroughReferralSystem('pool_payback', $mailData['sender_userid'], getPaymentPrice($mailData['payment_id']));
 
 							// Add points together and remove user
-							$pointsBack[$mailData['sender_userid']] += $points;
+							$pointsBack[$mailData['sender_userid']] += getPaymentPrice($mailData['payment_id']);
 						} // END - if
 
 						// Count up
@@ -301,19 +299,18 @@ if (!SQL_HASZERONUMS($result_main)) {
 					unset($temporaryReceivers[$key]);
 
 					// Update receivers
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `receivers`='%s' WHERE `id`=%s LIMIT 1",
-						array(implode(';', $temporaryReceivers), bigintval($mailData['id'])), __FILE__, __LINE__);
+					updatePoolData($mailData['id'], 'receivers', implode(';', $temporaryReceivers));
 				}
 			} // END - foreach
 		} // END - if
 	} // END - while
 
-	// Do we have points to "pay back"?
-	if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
+	// Is there points to "pay back"?
+	if ((isFilledArray($pointsBack)) && (!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) && (isValidUserId($userid))) {
+			if (($PB > 0) && (isValidId($userid))) {
 				// Prepare content
 				$content = array(
 					'points' => $PB
@@ -339,7 +336,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_main);
 
 // Remove variable
 unset($mailText);