X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=43edf8d258407165558537768086692fb9ea92b6;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hp=446b3e26ddbe92191eab94a05ea879762c83b44b;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 446b3e26dd..43edf8d258 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/14/2004 *
- * ===============                              Last change: 11/19/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/14/2004 *
+ * ===================                          Last change: 11/19/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_bonus.php                                *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,42 +54,40 @@ $curr = date('m', time());
 if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "WHERE `status`='CONFIRMED'";
-	$whereStatement2 = getConfig('bonus_ranks');
 
 	// 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 = sprintf("WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
-			$whereStatement2 = getConfig('bonus_ranks');
+			$whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
 		} // END - if
 	} // END - if
 
 	// Add more bonus points here
 	$add = '';
 	// @TODO Rewrite this to a filter
-	if (getConfig('bonus_click_yn') == 'Y') $add .= " + `turbo_bonus`";
-	if (getConfig('bonus_login_yn') == 'Y') $add .= " + `login_bonus`";
-	if (getConfig('bonus_order_yn') == 'Y') $add .= " + `bonus_order`";
-	if (getConfig('bonus_stats_yn') == 'Y') $add .= " + `bonus_stats`";
-	if (getConfig('bonus_ref_yn')   == 'Y') $add .= " + `bonus_ref`";
+	if (getConfig('bonus_click_yn') == 'Y') $add .= ' + `turbo_bonus`';
+	if (getConfig('bonus_login_yn') == 'Y') $add .= ' + `login_bonus`';
+	if (getConfig('bonus_order_yn') == 'Y') $add .= ' + `bonus_order`';
+	if (getConfig('bonus_stats_yn') == 'Y') $add .= ' + `bonus_stats`';
+	if (getConfig('bonus_ref_yn')   == 'Y') $add .= ' + `bonus_ref`';
 
 	// Shall we add some entries?
 	if (!empty($add)) {
-		$whereStatement1 .= " AND (0" . $add . ") > 0";
+		$whereStatement1 .= ' AND (0' . $add . ') > 0';
 	} // END - if
 
 	// Run SQL string to check for accounts
-	$result_main = SQL_QUERY_ESC("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."".$add."
+" . $whereStatement1 . "
 ORDER BY
 	`points` DESC,
 	`userid` ASC
-LIMIT %s",
-	array($whereStatement2), __FILE__, __LINE__);
+LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
 	// Some entries were found?
 	if (SQL_NUMROWS($result_main) > 0) {
@@ -100,18 +99,23 @@ LIMIT %s",
 				addPointsDirectly('monthly_bonus', $content['userid'], $content['points']);
 
 				// Translate gender/points
-				$content['gender']       = translateGender($content['gender']);
+				$content['gender'] = translateGender($content['gender']);
 				$content['points'] = translateComma($content['points']);
 
 				// Load email template and email it away
-				$message = loadEmailTemplate('member_bonus', $content['points'], bigintval($content['userid']));
+				$message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
 				sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
 			} // END - if
 		} // END - while
 
-		// Reset accounts
-		$result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
+		// Reset all accounts
+		$result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data`
+SET
+	`turbo_bonus`=0,
+	`login_bonus`=0,
+	`bonus_order`=0,
+	`bonus_stats`=0,
+	`bonus_ref`=0', __FILE__, __LINE__);
 	} // END - if
 
 	// Free memory