X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=b29d3fb625568476092b8d12ddcc7f1706726cb9;hp=b6b705170c7742eb14fd73847b6675a4d6037564;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=9f6c30cc0e06098171d773d671292081ecee3d29

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index b6b705170c..b29d3fb625 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,21 +77,21 @@ 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
 				//* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*<br />");
 				if (fetchUserData($userid)) {
@@ -151,14 +152,14 @@ if (SQL_NUMROWS($result_main) > 0) {
 								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__);
 
-								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 />");
 									updateMediadataEntry(array('total_send', 'normal_send'), 'add', 1);
@@ -209,11 +210,11 @@ 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
-						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', 'normal_orders'), 'add', 1);
@@ -227,8 +228,11 @@ if (SQL_NUMROWS($result_main) > 0) {
 						// 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 />");
 						break;
@@ -238,7 +242,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__);