X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fpool%2Fpool-bonus.php;h=001d12b8eae8905ada3d01e1ec80d9a409404ffc;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hp=8951eafdcc2f2e563d3dadf5b91512bf86f79a53;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index 8951eafdcc..001d12b8ea 100644
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,26 +49,53 @@ if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
 	return false;
 }
 
-// Need this here
 // Only send bonus mail when bonus extension is active and maximum send-mails is not reached
 if ($GLOBALS['pool_cnt'] < getMaxSend()) {
-	// Do we need to send out bonus mails?
+	// Default is ext-html_mail is gone
+	$add = '';
+
+	// Send out bonus mails?
 	if (isExtensionActive('html_mail')) {
-		//                                 0        1        2          3          4        5          6            7         8        9            10           11
-		$result_bonus = SQL_QUERY("SELECT `id`,`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`html_msg` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
-	} else {
-		//                                 0        1        2          3          4        5          6            7         8        9            10
-		$result_bonus = SQL_QUERY("SELECT `id`,`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `data_type`='NEW' ORDER BY `timestamp` DESC", __FILE__, __LINE__);
-	}
-
-	if (!SQL_HASZERONUMS($result_bonus)) {
+		//  With HTML support
+		$add = ', `html_msg`';
+	} // END - if
+
+	// Run query
+	$result_main = SQL_QUERY("SELECT
+	`id`,
+	`subject`,
+	`text`,
+	`receivers`,
+	`points`,
+	`time`,
+	`data_type`,
+	`timestamp`,
+	`url`,
+	`cat_id`,
+	`target_send`
+	" . $add . "
+FROM
+	`{?_MYSQL_PREFIX?}_bonus`
+WHERE
+	`data_type`='NEW'
+ORDER BY
+	`timestamp` DESC", __FILE__, __LINE__);
+
+	// Some mails left?
+	if (!SQL_HASZERONUMS($result_main)) {
+		// Init SQLs here
+		initSqls();
+
 		// Send these mails away...
 		$count2 = '';
-		while ($mailData = SQL_FETCHARRAY($result_bonus)) {
+		while ($mailData = SQL_FETCHARRAY($result_main)) {
 			// Message is active in queue
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `data_type`='QUEUE' WHERE `id`=%s LIMIT 1",
 				array(bigintval($mailData['id'])), __FILE__, __LINE__);
 
+			// Default is no users left
+			$receivers = array();
+
 			// "Explode" all receivers into an array
 			if (isInString(';', $mailData['receivers'])) {
 				// There's more than one receiver in the list...
@@ -76,14 +103,13 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 			} elseif (!empty($mailData['points'])) {
 				// Only one user left
 				$receivers = array($mailData['receivers']);
-			} else {
-				// No users left
-				$receivers = array(0);
 			}
 			$temporaryReceivers = $receivers;
 
-			// Now, if we are good little boys and girls Santa Claus left us some user-ids.
-			// We can now send mails to them...
+			/*
+			 * Now, if we are good little boys and girls Santa Claus left us
+			 * some user-ids and send out mails to them.
+			 */
 			foreach ($receivers as $key => $userid) {
 				// Load personal data
 				if (fetchUserData($userid)) {
@@ -111,16 +137,17 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 							// Count one up and remove entry from dummy array
 							$GLOBALS['pool_cnt']++; unset($temporaryReceivers[$key]);
 
+							// Is ext-user installed?
 							if (isExtensionInstalledAndNewer('user', '0.1.4')) {
+								// Debug message
+								//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',mailData[id]=' . $mailData['id']);
 								// Update mails received for receiver
-								SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
-								array(bigintval($userid)), __FILE__, __LINE__);
+								addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1", bigintval($userid)));
 							} // END - if
 
-							// Do we have send maximum mails?
+							// Is the size of pool reached or nothing to sent left?
 							if (($GLOBALS['pool_cnt'] >= getMaxSend()) || (countSelection($temporaryReceivers) == 0)) {
-								// Yes, we have
-								//* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__);
+								// Yes, it is. So abort here
 								break;
 							} // END - if
 							break;
@@ -132,6 +159,9 @@ if ($GLOBALS['pool_cnt'] < getMaxSend()) {
 				} // END - if
 			} // END - foreach
 
+			// Run all SQLs
+			runFilterChain('run_sqls');
+
 			// Update mediadata if version is 0.0.4 or higher
 			if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
 				// Update entry (or add missing
@@ -180,13 +210,16 @@ LIMIT 1",
 						bigintval($mailData['id'])
 					), __FILE__, __LINE__);
 				//* DEBUG: */ debugOutput('*L:'.__LINE__.'<pre>'.print_r($temporaryReceivers, true).'</pre>!!!');
+
+				// Run any SQLs
+				runFilterChain('run_sqls');
 				break;
 			}
 		} // END - while
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_bonus);
+	SQL_FREERESULT($result_main);
 
 	// Remove variable
 	unset($mailText);