X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdaily%2Fdaily_user.php;h=788e559edc2d79b8277ac5bd01d282c58affaca9;hb=35fd597b272983427fd88f541ea55642e0b42c9e;hp=fa5e28e1892a126286aaceec40ade5c6b050b2c6;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec;p=mailer.git

diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php
index fa5e28e189..788e559edc 100644
--- a/inc/daily/daily_user.php
+++ b/inc/daily/daily_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 *
@@ -38,11 +38,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-	// Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || (!isDailyResetEnabled())) {
+	// Do not execute when script is in non-HTML mode or no daily reset
 	return;
 } elseif ((!isExtensionActive('sql_patches')) || (!isExtensionActive('user'))) {
-	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) disabled.');
+	if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) ext-sql_patches/ext-user disabled.');
 	return;
 }
 
@@ -52,25 +52,27 @@ if (!defined('__SECURITY')) {
 // Update user profiles
 if (isExtensionInstalledAndNewer('order', '0.1.1')) {
 	// Latest version
-	SQL_QUERY('UPDATE
+	sqlQuery('UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`receive_mails`=`max_mails`,
 	`mail_orders`=0
 WHERE
-	`receive_mails` != `max_mails`', __FILE__, __LINE__);
+	`receive_mails` != `max_mails`
+	' . runFilterChain('user_exclusion_sql', ' ') . '', __FILE__, __LINE__);
 } else {
 	// Obsolete version
-	SQL_QUERY('UPDATE
+	sqlQuery('UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`receive_mails`=`max_mails`
 WHERE
-	`receive_mails` != `max_mails`', __FILE__, __LINE__);
+	`receive_mails` != `max_mails`
+	' . runFilterChain('user_exclusion_sql', ' ') . '', __FILE__, __LINE__);
 }
 
 // Transfer points from locked_points to points
-$result_daily = SQL_QUERY("SELECT
+$result_daily = sqlQuery("SELECT
 	`userid`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
@@ -81,17 +83,17 @@ WHERE
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
-//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . SQL_NUMROWS($result_daily));
-if (!SQL_HASZERONUMS($result_daily)) {
+//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . sqlNumRows($result_daily));
+if (!ifSqlHasZeroNums($result_daily)) {
 	// Init SQLs
 	initSqls();
 
 	// Run through all 'locked_(foo)_points columsn
 	foreach (runFilterChain('locked_points_columns_array', array('points')) as $columnName) {
 		// Start checking accounts which are on 0 confirmed-to-go mails
-		while ($content = SQL_FETCHARRAY($result_daily)) {
+		while ($content = sqlFetchArray($result_daily)) {
 			//* DEBUG: */ debugOutput(basename(__FILE__) . ':' . $content['userid']);
-			$result_points = SQL_QUERY_ESC("SELECT
+			$result_points = sqlQueryEscaped("SELECT
 	`ref_depth`,
 	`locked_%s`
 FROM
@@ -107,17 +109,17 @@ ORDER BY
 					$columnName
 				), __FILE__, __LINE__);
 
-			//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . SQL_NUMROWS($result_points));
-			if (!SQL_HASZERONUMS($result_points)) {
+			//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . sqlNumRows($result_points));
+			if (!ifSqlHasZeroNums($result_points)) {
 				// Ok transfer points
-				while ($content2 = SQL_FETCHARRAY($result_points)) {
+				while ($content2 = sqlFetchArray($result_points)) {
 					// Merge both arrays
 					$content = merge_array($content, $content2);
 
 					//* DEBUG: */ debugOutput(basename(__FILE__) . ':userid=' . $content['userid'].',depth='.$content['ref_depth'].',columnName=' . $columnName . ',locked='.$content['locked_' . $columnName]);
 					if ($content['ref_depth'] > 0) {
 						// Level 1+
-						addSql(SQL_QUERY_ESC("UPDATE
+						addSql(sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_points`
 SET
 	`%s`=`%s`+%s,
@@ -137,7 +139,7 @@ LIMIT 1",
 						);
 					} else {
 						// Level zero
-						addSql(SQL_QUERY_ESC("UPDATE
+						addSql(sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_points`
 SET
 	`%s`=`%s`+%s,
@@ -165,7 +167,7 @@ LIMIT 1",
 			} // END - if
 
 			// Free memory
-			SQL_FREERESULT($result_points);
+			sqlFreeResult($result_points);
 		} // END - while
 	} // END - foreach
 
@@ -174,7 +176,7 @@ LIMIT 1",
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_daily);
+sqlFreeResult($result_daily);
 
 // Debug line
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');