X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=a4b8f85652420ac6e163c4a203929edef8d6fb42;hb=330dbb3e2b34450cd1665497506455e195a0a166;hp=4237934156efb9589840b5ecd4898894b74347a3;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 4237934156..a4b8f85652 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 11/14/2004 *
- * ===================                          Last change: 11/19/2004 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_bonus.php                                *
@@ -14,10 +14,9 @@
  * $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 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,28 +38,25 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no hourly reset
+	return;
 } elseif (!isExtensionActive('bonus')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() == 1) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
-// Get current month (2 digits)
-$curr = date('m', time());
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
+if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
-	$whereStatement1 = "WHERE `status`='CONFIRMED'";
+	$whereStatement = "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) {
-			// Okay, include last online timestamp
-			$whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
-		} // END - if
+	if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
+		// Okay, include last online timestamp
+		$whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
 	} // END - if
 
 	// Add more bonus points here
@@ -74,22 +70,22 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (get
 
 	// Shall we add some entries?
 	if (!empty($add)) {
-		$whereStatement1 .= ' AND (0' . $add . ') > 0';
+		$whereStatement .= ' AND (0' . $add . ') > 0';
 	} // 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 . "
+' . $whereStatement . '
 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
@@ -97,13 +93,9 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 				// Add points to user's account directly
 				addPointsDirectly('monthly_bonus', $content['userid'], $content['points']);
 
-				// Translate gender/points
-				$content['gender'] = translateGender($content['gender']);
-				$content['points'] = translateComma($content['points']);
-
 				// Load email template and email it away
 				$message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-				sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
+				sendEmail($content['email'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
 			} // END - if
 		} // END - while
 
@@ -121,5 +113,8 @@ SET
 	SQL_FREERESULT($result_main);
 } // END - if
 
-//
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
+// [EOF]
 ?>