X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=eec29f9ca73224355451fc9a94a0b4759edcda1f;hp=dac7c27d85076dece6db43a27d6229bb7b0e48bf;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index dac7c27d85..eec29f9ca7 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/12/2008 *
- * ===============                              Last change: 12/12/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 12/12/2008 *
+ * ===================                          Last change: 12/12/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : pool-user.php                                    *
@@ -14,10 +14,9 @@
  * $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 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,10 +38,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Don't run on daily reset
-if (isResetModeEnabled()) {
+if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
 	// Skip here
 	return false;
 } elseif (!isExtensionActive('user')) {
@@ -50,19 +49,34 @@ if (isResetModeEnabled()) {
 	return false;
 }
 
-// Need this here
+// No HTML is default
+$HTML = '';
+
 // Check for freed mail orders to send out
 if (isExtensionActive('html_mail')) {
-	//                                0     1        2      3       4          5            6      7        8          9       10
-	$result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{?_MYSQL_PREFIX?}_pool` WHERE `data_type`='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
-} else {
-	//                                0     1        2      3       4          5            6      7        8          9    10
-	$result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM `{?_MYSQL_PREFIX?}_pool` WHERE `data_type`='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
-}
+	// With HTML mails
+	$HTML = ', `html_msg`';
+} // 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."
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`data_type`='NEW'
+ORDER BY
+	`timestamp` DESC", __FILE__, __LINE__);
 
 // 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
@@ -70,135 +84,126 @@ if (SQL_NUMROWS($result_main) > 0) {
 			array($DATA['id']), __FILE__, __LINE__);
 
 		// Check fetched data for HTML
-		$HTML = 'N';
-		if (isset($DATA['html_msg'])) $HTML = $DATA['html_msg'];
+		$isHtml = 'N';
+		if (isset($DATA['html_msg'])) $isHtml = $DATA['html_msg'];
 
 		// Entry updated?
-		if (SQL_AFFECTEDROWS() == 1) {
+		if (!SQL_HASZEROAFFECTED()) {
 			// "Explode" all receivers into an array
-			if (ereg(';', $DATA['receivers'])) {
+			if (isInString(';', $DATA['receivers'])) {
 				// There's more than one receiver in the list...
-				$RECEIVERS = explode(';', $DATA['receivers']);
+				$receivers = explode(';', $DATA['receivers']);
 			} elseif (!empty($DATA['receivers'])) {
 				// Only one user left
-				$RECEIVERS = array($DATA['receivers']);
+				$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 => $userid) {
+			foreach ($receivers as $key => $userid) {
 				// Lookup user id
-				//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*<br />");
+				//* 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__);
+						array($DATA['id'], $DATA['sender_userid'], $DATA['timestamp']), __FILE__, __LINE__);
 
 					// If there's no stats entry add it!
-					//* DEBUG: */ outputHtml("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!<br />");
-					if (SQL_NUMROWS($result_stats) == '0') {
+					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
+					if (SQL_HASZERONUMS($result_stats)) {
 						// 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['id']), bigintval($DATA['sender']), bigintval($DATA['cat_id']), bigintval($DATA['payment_id']), $DATA['subject'], $DATA['url'], $DATA['target_send'], bigintval($DATA['timestamp'])), __FILE__, __LINE__);
+							array(bigintval($DATA['id']), bigintval($DATA['sender_userid']), 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['id']), bigintval($DATA['sender']), bigintval($DATA['timestamp'])), __FILE__, __LINE__);
+							array(bigintval($DATA['id']), bigintval($DATA['sender_userid']), bigintval($DATA['timestamp'])), __FILE__, __LINE__);
 					} // END - if
 
-					//* DEBUG: */ outputHtml("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!<br />");
+					//* 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."?<br />");
-						switch (removeReceiver($dummy, $key, bigintval($userid), bigintval($DATA['id']), bigintval($stats_id))) {
+						// Remove receiver from list
+						$status = removeReceiver($dummy, $key, bigintval($userid), bigintval($DATA['id']), bigintval($stats_id));
+
+						//* DEBUG: */ debugOutput('?L:'.__LINE__.'/'.$dummy.'/'.$key.'/'.$userid.'('.['sender_userid'].')/'.$DATA['id'].'/'.$stats_id.'?');
+						switch ($status) {
 							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) {
-									if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
-								} // 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);
+								sendEmail(getUserData('email'), $DATA['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",
-									array(bigintval($DATA['sender'])), __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_userid'])), __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",
+									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__."*<br />");
+									//* 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']."*<br />");
+								//* 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']."<br />");
+								//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$GLOBALS['pool_cnt']);
 								break;
-						}
-					}
+
+							default: // Unknown return type
+								logDebugMessage(__FILE__, __LINE__, 'Unknown status ' . $status . ' detected. pool_id=' . $DATA['id'] . ',sender=' . $DATA['sender_userid'] . ',stats_id=' . $stats_id);
+								break;
+						} // END - switch
+					} // END - if
 
 					// 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']."*<br />");
+					//* 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']),
+							'sender_userid' => $DATA['sender_userid'],
+							'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'])) {
+						if (fetchUserData($DATA['sender_userid'])) {
 							// Load email template
-							$mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
+							$mailText = loadEmailTemplate('done-member', $content, $DATA['sender_userid']);
 
 							// 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
@@ -210,27 +215,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__."*<br />");
+							//* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
 							updateMediadataEntry(array('total_orders', 'normal_orders'), 'add', 1);
 						} // END - if
 
-						//* DEBUG: */ outputHtml("*EXIT/L:".__LINE__.'/'.$P."<br />");
+						//* 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__."*<br />");
+						//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'*');
 						break;
 					}
 
@@ -238,23 +246,23 @@ 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['id'] == '0') || (empty($RECEIVERS['id']))) {
+					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['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);
+							addPointsDirectly('pool_payback', $DATA['sender_userid'], $points);
 
 							// Add points together and remove user
-							$pointsBack[$DATA['sender']] += $points;
+							$pointsBack[$DATA['sender_userid']] += $points;
 						} // END - if
 
 						// Count up
-						$cnt_back[$DATA['sender']]++;
+						$count_back[$DATA['sender_userid']]++;
 					}
 
 					// Remove entry from list
@@ -264,19 +272,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)
@@ -285,18 +293,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);
@@ -304,5 +312,5 @@ SQL_FREERESULT($result_main);
 // Remove variable
 unset($mailText);
 
-//
+// [EOF]
 ?>