X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=d18b95c6cd7502f437945d6d7bc4b663d7809dd7;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hp=d90c75d387780533a12b0463efc635b359b2d173;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index d90c75d387..d18b95c6cd 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatlicher Bonus von Klick-Verguetung           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,54 +38,58 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-} elseif (!EXT_IS_ACTIVE("bonus")) {
+} elseif (!EXT_IS_ACTIVE('bonus')) {
 	return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+if ((getOutputMode() == 1) || (!isResetModeEnabled())) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
-$curr = date("m", time());
+$curr = date('m', time());
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($CSS != 1)) {
-	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
+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 = bigintval(getConfig('bonus_ranks'));
+	$whereStatement2 = getConfig('bonus_ranks');
 
 	// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
-	if (EXT_IS_ACTIVE("autopurge")) {
+	if (EXT_IS_ACTIVE('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 = bigintval(getConfig('bonus_ranks'));
+			$whereStatement1 = sprintf("WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+			$whereStatement2 = getConfig('bonus_ranks');
 		} // END - if
 	} // END - if
 
 	// Add more bonus points here
-	$ADD = "";
-	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";
+	$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`";
 
 	// Shall we add some entries?
-	if (!empty($ADD)) {
-		$whereStatement1 .= " AND (0".$ADD.") > 0";
+	if (!empty($add)) {
+		$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
-FROM `{!_MYSQL_PREFIX!}_user_data`
-".$whereStatement1."".$ADD."
-ORDER BY points DESC, userid
+	$result_main = SQL_QUERY_ESC("SELECT `userid`, `email`, `gender`, `surname`, `family`, (0".$add.") AS points
+FROM
+	`{!_MYSQL_PREFIX!}_user_data`
+".$whereStatement1."".$add."
+ORDER BY
+	`points` DESC,
+	`userid` ASC
 LIMIT %s",
-		array($whereStatement2), __FILE__, __LINE__);
+	array($whereStatement2), __FILE__, __LINE__);
 
 	// Some entries were found?
 	if (SQL_NUMROWS($result_main) > 0) {
@@ -89,15 +98,15 @@ LIMIT %s",
 			// Make sure zero points are not mailed
 			if ($content['points'] > 0) {
 				// Add points to user's account directly
-				ADD_POINTS_REFSYSTEM("monthly_bonus", $content['uid'], $content['points'], false, "0", false, "direct");
+				ADD_POINTS_REFSYSTEM_DIRECT('monthly_bonus', $content['uid'], $content['points']);
 
 				// Translate gender/points
-				$content['gender']       = TRANSLATE_GENDER($content['gender']);
-				$content['points'] = TRANSLATE_COMMA($content['points']);
+				$content['gender']       = translateGender($content['gender']);
+				$content['points'] = translateComma($content['points']);
 
 				// Load email template and email it away
-				$msg = LOAD_EMAIL_TEMPLATE("member_bonus", $content['points'], bigintval($content['uid']));
-				SEND_EMAIL($content['email'], BONUS_MONTHLY_ONLINE_BONUS, $msg);
+				$message = LOAD_EMAIL_TEMPLATE('member_bonus', $content['points'], bigintval($content['uid']));
+				sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
 			} // END - if
 		} // END - while