X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=1abf8a079befa926fe1ef1d5814885b319fe5a38;hp=a2d1bc1bfd3dddc7b9f038b37da1cdbdcc09eefe;hb=4e5020660b07f30b7bf3ccc0a2ca664a19a21c0d;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index a2d1bc1bfd..1abf8a079b 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                                    *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -61,7 +62,7 @@ if (isExtensionActive('html_mail')) {
 }
 
 // Reset variables
-$cnt2 = 0; $lastSentId = 0; $cnt_back = array(0); $pointsBack = array(0);
+$cnt2 = '0'; $lastSentId = '0'; $cnt_back = array(0); $pointsBack = array(0);
 if (SQL_NUMROWS($result_main) > 0) {
 	// Parse all mails
 	while ($DATA = SQL_FETCHARRAY($result_main, 0, false)) {
@@ -76,41 +77,31 @@ if (SQL_NUMROWS($result_main) > 0) {
 		// Entry updated?
 		if (SQL_AFFECTEDROWS() == 1) {
 			// "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
-				$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?
 				//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*<br />");
-				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",
 						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)."!<br />");
-					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())",
 							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__);
@@ -131,9 +122,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 +146,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",
@@ -163,7 +154,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 
 								if (getExtensionVersion('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
 
@@ -203,24 +194,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, getMessage('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 +210,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
@@ -258,7 +239,7 @@ 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__);
@@ -300,19 +281,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 +294,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