X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=1b746af267666e101d90ba5e1802398569a52c5b;hb=1db892c666b0b70bf87cb9582eae38c95548a2ef;hp=14640c1a2b67c09150fcb728d053617937dabe05;hpb=da475800e7c8dba5434f2baddadae8d65a7dff2f;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 14640c1a2b..1b746af267 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,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,7 +49,7 @@ 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'";
 
@@ -79,18 +77,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 +98,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