X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fpool%2Fpool-user.php;h=f65a12cee40008160774a574331bc3df786e9de5;hp=1e35fec1423c414c054f09fad6390edba59d5c5b;hb=f2b603aed42bfdf7a94611d7bae71fe3a1048890;hpb=a14d4b587ae7cf3b6793cf33537d17db4541acc0

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 1e35fec142..f65a12cee4 100644
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
 	// Skip here
 	return FALSE;
-} elseif (!isExtensionActive('user')) {
-	// Abort here if extension user is not active
+} elseif ((!isExtensionActive('user')) || (!isExtensionActive('other'))) {
+	// Abort here if extension user/other are not active
 	return FALSE;
 }
 
@@ -59,7 +59,7 @@ if (isExtensionActive('html_mail')) {
 } // END - if
 
 // Main query
-$result_main = SQL_QUERY("SELECT
+$result_main = sqlQuery("SELECT
 	`id`,
 	`sender` AS `sender_userid`,
 	`subject`,
@@ -84,9 +84,9 @@ $lastSentId = '0';
 $count_back = array(0);
 $pointsBack = array(0);
 
-if (!SQL_HASZERONUMS($result_main)) {
+if (!ifSqlHasZeroNums($result_main)) {
 	// Parse all mails
-	while ($mailData = SQL_FETCHARRAY($result_main)) {
+	while ($mailData = sqlFetchArray($result_main)) {
 		// Set mail order as 'active'. That means it will be sent out
 		updatePoolDataById($mailData['id'], 'data_type', 'ACTIVE', NULL, " AND `data_type`='NEW'");
 
@@ -97,7 +97,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 		} // END - if
 
 		// Entry updated?
-		if (!SQL_HASZEROAFFECTED()) {
+		if (!ifSqlHasZeroAffectedRows()) {
 			// "Explode" all receivers into an array
 			if (isInString(';', $mailData['receivers'])) {
 				// There's more than one receiver in the list...
@@ -115,17 +115,17 @@ if (!SQL_HASZERONUMS($result_main)) {
 			// We can now send mails to them...
 			foreach ($receivers as $key => $userid) {
 				// Lookup user id
-				//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
+				//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.sqlNumRows($result_user).'*');
 				if (fetchUserData($userid)) {
 					// Is there 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",
+					$result_stats = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
 						array($mailData['id'], $mailData['sender_userid'], $mailData['timestamp']), __FILE__, __LINE__);
 
 					// If there's no stats entry add it!
-					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
-					if (SQL_HASZERONUMS($result_stats)) {
+					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
+					if (ifSqlHasZeroNums($result_stats)) {
 						// No entry was found, so we add him!
-						SQL_QUERY_ESC("INSERT INTO
+						sqlQueryEscaped("INSERT INTO
 	`{?_MYSQL_PREFIX?}_user_stats`
 (
 	`pool_id`,
@@ -160,14 +160,14 @@ if (!SQL_HASZERONUMS($result_main)) {
 							), __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",
+						$result_stats = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
 							array(bigintval($mailData['id']), bigintval($mailData['sender_userid']), bigintval($mailData['timestamp'])), __FILE__, __LINE__);
 					} // END - if
 
-					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
-					if (SQL_NUMROWS($result_stats) == 1) {
+					//* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
+					if (sqlNumRows($result_stats) == 1) {
 						// We got one!
-						list($stats_id) = SQL_FETCHROW($result_stats);
+						list($stats_id) = sqlFetchRow($result_stats);
 
 						// Remove receiver from list
 						$status = removeReceiver($temporaryReceivers, $key, bigintval($userid), bigintval($mailData['id']), bigintval($stats_id));
@@ -185,12 +185,12 @@ if (!SQL_HASZERONUMS($result_main)) {
 								sendEmail(getUserData('userid'), $mailData['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",
+								sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_sent`=`emails_sent`+1 WHERE `userid`=%s LIMIT 1",
 									array(bigintval($mailData['sender_userid'])), __FILE__, __LINE__);
 
 								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",
+									sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
 										array(bigintval($userid)), __FILE__, __LINE__);
 								} // END - if
 
@@ -218,8 +218,8 @@ if (!SQL_HASZERONUMS($result_main)) {
 						} // END - switch
 					} // END - if
 
-					// Is there reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
-					//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getConfig('max_send').'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
+					// Is there reached the maximum to send mails? || (getMaxSend() >= $GLOBALS['pool_cnt'])
+					//* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getMaxSend().'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
 					if ((($GLOBALS['pool_cnt'] >= $mailData['target_send'])) && ($lastSentId != $mailData['id'])) {
 						// Prepare content
 						$content = array(
@@ -246,7 +246,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 						updatePoolDataById($mailData['id'], NULL, array('data_type' => 'SEND', 'target_send' => '0', 'receivers' => ''));
 
 						// Update send-completed-time
-						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
+						sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `timestamp_send`=UNIX_TIMESTAMP() WHERE `pool_id`=%s LIMIT 1",
 							array(bigintval($mailData['id'])), __FILE__, __LINE__);
 
 						$lastSentId = $mailData['id']; $GLOBALS['pool_cnt'] = '0';
@@ -263,7 +263,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 						break;
 					}
 					// Is there send maximum mails?
-					elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($count2 >= getConfig('max_send'))) {
+					elseif (($GLOBALS['pool_cnt'] >= getMaxSend()) || ($count2 >= getMaxSend())) {
 						// 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'] <= $mailData['target_send']) $add = ',`target_send`=`target_send`-' . $GLOBALS['pool_cnt'];
@@ -274,7 +274,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 					}
 
 					// Free result
-					SQL_FREERESULT($result_stats);
+					sqlFreeResult($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']))) {
@@ -336,7 +336,7 @@ if (!SQL_HASZERONUMS($result_main)) {
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_main);
 
 // Remove variable
 unset($mailText);