X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=c213c83e659721d5a9efbbff98924be00b4d758e;hb=8d4176053d397a86baca20b4d7ab7ed526355be8;hp=b926258d9c04e97561c3dc0bb75220670e181c86;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index b926258d9c..c213c83e65 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.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-bonus.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 *
@@ -71,31 +72,25 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 				array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
 			// "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['points'])) {
 				// 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) {
 				// Load personal data
-				//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.$userid."*<br />");
-				$result_user = SQL_QUERY_ESC("SELECT `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-					array(bigintval($userid)), __FILE__, __LINE__);
-
-				// Is his data available?
-				if (SQL_NUMROWS($result_user) == 1) {
+				if (fetchUserData($userid)) {
 					// The final receiver does exists so we can continue...
-					list($surname, $family, $email) = SQL_FETCHROW($result_user);
-					//* DEBUG: */ outputHtml("OK!/L:".__LINE__."<br />");
+					//* DEBUG: */ debugOutput('OK!/L:'.__LINE__);
 
 					// Mark this user as "spammed" ;-) And place a line for him...
 					if (removeReceiver($dummy, $key, $userid, $DATA['id'], $DATA['id'], true) == 'done') {
@@ -104,91 +99,96 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 							if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
 						} // END - foreach
 
-						// Prepare content
-						$content = array(
-							'id'       => $DATA['id'],
-							'url'      => $DATA['url'],
-							'time'     => createFancyTime($DATA['time']),
-							'points'   => translateComma($DATA['points']),
-							'category' => getCategory($DATA['cat_id']),
-							'text'     => $DATA['text']
-						);
-
 						// Prepare the mail
-						$mailText = loadEmailTemplate('bonus-mail', $content, $userid);
+						$mailText = loadEmailTemplate('bonus-mail', $DATA, $userid);
 
 						// Send mail away
 						if (isset($DATA['html_msg'])) {
 							// Send HTML?
-							sendEmail($email, $DATA['subject'], $mailText, $DATA['html_msg']);
+							sendEmail(getUserData('email'), $DATA['subject'], $mailText, $DATA['html_msg']);
 						} else {
 							// No HTML mail!
-							sendEmail($email, $DATA['subject'], $mailText);
+							sendEmail(getUserData('email'), $DATA['subject'], $mailText);
 						}
 
 						// Count one up and remove entry from dummy array
 						$GLOBALS['pool_cnt']++; unset($dummy[$key]);
 
-						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
 
 						// Do we have send maximum mails?
 						if (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || (countSelection($dummy) == 0)) {
 							// Yes, we have
-							//* DEBUG: */ outputHtml("*EXIT/L:".__LINE__."<br />");
+							//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__);
 							break;
 						} // END - if
 					} // END - if
 				} // END - if
-
-				// Free some memory
-				SQL_FREERESULT($result_user);
-			}
+			} // END - foreach
 
 			// 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
 				$P = $GLOBALS['pool_cnt'];
 				if (!empty($cnt2) && empty($GLOBALS['pool_cnt'])) $P = $cnt2;
-				//* DEBUG: */ outputHtml("+MEDIA/L:".__LINE__.'/'.$P."+<br />");
-				updateMediadataEntry(array("total_send", "bonus_send"), 'add', $P);
+				//* DEBUG: */ debugOutput('+MEDIA/L:'.__LINE__.'/'.$P.'+');
+				updateMediadataEntry(array('total_send', 'bonus_send'), 'add', $P);
 			} // END - if
 
 			// Close sending system
-			//* DEBUG: */ outputHtml("-L:".__LINE__.'/'.countSelection($dummy)."-<br />");
+			//* DEBUG: */ debugOutput('-L:'.__LINE__.'/'.countSelection($dummy).'-');
 			if (countSelection($dummy) == 0) {
 				// Queue reached!
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='SEND', `target_send`=0, `receivers`='' WHERE `id`=%s LIMIT 1",
-				array(bigintval($DATA['id'])), __FILE__, __LINE__);
-				//* DEBUG: */ outputHtml("*L:".__LINE__."*<br />");
+				SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_bonus`
+SET
+	`data_type`='SEND',
+	`target_send`=0,
+	`receivers`=''
+WHERE
+	`id`=%s
+LIMIT 1",
+					array(bigintval($DATA['id'])), __FILE__, __LINE__);
+				//* DEBUG: */ debugOutput('*L:'.__LINE__.'*');
 
 				// 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 />");
-					updateMediadataEntry(array("total_orders", "bonus_orders"), 'add', 1);
+					//* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
+					updateMediadataEntry(array('total_orders', 'bonus_orders'), 'add', 1);
 				} // END - if
 			} elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
 				// Update bonus pool
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='NEW', `target_send`=%s, `receivers`='%s' WHERE `id`=%s LIMIT 1",
-				array(countSelection($dummy), implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
-				//* DEBUG: */ outputHtml("*L:".__LINE__."<pre>");
-				//* DEBUG: */ outputHtml(print_r($dummy, true));
-				//* DEBUG: */ outputHtml("</pre>\n!!!<br />");
+				SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_bonus`
+SET
+	`data_type`='NEW',
+	`target_send`=%s,
+	`receivers`='%s'
+WHERE
+	`id`=%s
+LIMIT 1",
+					array(
+						countSelection($dummy),
+						implode(';', $dummy),
+						bigintval($DATA['id'])
+					), __FILE__, __LINE__);
+				//* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($dummy, true).'</pre>!!!');
 				break;
 			}
-		}
-	}
+		} // END - while
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_bonus);
 
 	// Remove variable
 	unset($mailText);
-}
+} // END - if
 
-//
+// [EOF]
 ?>