X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=d34f7375a9cf090a41452e682cf3145e8acca811;hb=3abc2f610631edd1dfe7ae9608db056c48bd0fa6;hp=cb010de05e74c2545ff4d830b30cc96be63a2297;hpb=acfb401fcf545c211ed51b8644d0965e35fdad07;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index cb010de05e..d34f7375a9 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
 	// Do not execute when script is in CSS mode or no daily reset
 	return;
 } elseif (!isExtensionActive('bonus')) {
@@ -51,14 +51,14 @@ if (!defined('__SECURITY')) {
 // Get current month (2 digits)
 $curr = getMonth();
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "WHERE `status`='CONFIRMED'";
 
 	// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
 	if (isExtensionActive('autopurge')) {
 		// Use last online stamp only when autopurge for inactive members is activated
-		if (getConfig('ap_inactive_since') > 0) {
+		if (getApInactiveSince() > 0) {
 			// Okay, include last online timestamp
 			$whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
 		} // END - if
@@ -79,18 +79,18 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (get
 	} // END - if
 
 	// Run SQL string to check for accounts
-	$result_main = SQL_QUERY("SELECT
-	`userid`, `email`, `gender`, `surname`, `family`, (0" . $add . ") AS points
+	$result_main = SQL_QUERY('SELECT
+	`userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS points
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
-" . $whereStatement1 . "
+' . $whereStatement1 . '
 ORDER BY
 	`points` DESC,
 	`userid` ASC
-LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
+LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 
 	// Some entries were found?
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Make sure zero points are not mailed
@@ -100,7 +100,7 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
 				// Load email template and email it away
 				$message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-				sendEmail($content['email'], '{--BONUS_MONTHLY_ONLINE_BONUS--}', $message);
+				sendEmail($content['email'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
 			} // END - if
 		} // END - while