From: Roland Häder <roland@mxchange.org>
Date: Sat, 1 Nov 2008 13:12:02 +0000 (+0000)
Subject: Some fixes for monthly mails
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=987d9756224c8a3f2c35d55372f8a467dee42c5f

Some fixes for monthly mails
---

diff --git a/inc/databases.php b/inc/databases.php
index af9a585292..55ebc02460 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "519");
+define('CURR_SVN_REVISION', "520");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 2a78b37a0d..a96f75673f 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -47,26 +47,23 @@ if (($CSS == 1) || (!defined('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N"
 $curr = date("m", time());
 
 // Check if month is done
-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['last_month'] > 0) && ($_CONFIG['beg_ranks'] > 0) && ($CSS != 1))
-{
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['last_month'] > 0) && ($_CONFIG['beg_ranks'] > 0) && ($CSS != 1)) {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "";
 	$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
 
 	// Let's check if there are some points left we can "pay"...
-	if (EXT_IS_ACTIVE("autopurge"))
-	{
+	if (EXT_IS_ACTIVE("autopurge")) {
 		// Use last online stamp only when autopurge for inactive members is activated
-		if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y"))
-		{
+		if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y")) {
 			// Okay, include last online timestamp
 			$whereStatement1 = sprintf("AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval($_CONFIG['ap_inactive_since']));;
 			$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
-		}
-	}
+		} // END - if
+	} // END - if
 
 	// SQL string to check for accounts
-	$result_main = SQL_QUERY_ESC("SELECT userid, email, beg_points
+	$result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points AS points
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' ".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
@@ -75,31 +72,25 @@ LIMIT %s",
 
 	if (SQL_NUMROWS($result_main) > 0) {
 		// Load our winners...
-		$UIDs = "";
-		while(list($uid, $email, $points) = SQL_FETCHROW($result_main)) {
+		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Add points to user's account directly
-			ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
+			ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
 
-			// Load email template and email it away
-			$msg = LOAD_EMAIL_TEMPLATE("member_beg", $points, bigintval($uid));
-			SEND_EMAIL($email, BEG_MONTHLY_RALLYE, $msg);
-		}
-
-		// Remove first commata
-		$UIDs = substr($UIDs, 1);
+			// Translate gender
+			$content['gender'] = TRANSLATE_GENDER($content['gender']);
 
-		// Get current month
-		$curr = date("m", time());
-		if (strlen($curr) == 1) $curr = "0".$curr;
-		if ($curr == "00") $curr = "12";
+			// Load email template and email it away
+			$msg = LOAD_EMAIL_TEMPLATE("member_beg", $content, bigintval($content['uid']));
+			SEND_EMAIL($content['email'], BEG_MONTHLY_RALLYE, $msg);
+		} // END - while
 
 		// Reset accounts
 		$result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);
-	}
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>
diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 2b18fb308d..de9bf0b9cc 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -46,23 +46,20 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1))
-{
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1)) {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "WHERE status='CONFIRMED'";
 	$whereStatement2 = bigintval($_CONFIG['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 ($_CONFIG['ap_inactive_since'] > 0)
-		{
+		if ($_CONFIG['ap_inactive_since'] > 0) {
 			// Okay, include last online timestamp
 			$whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
 			$whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
-		}
-	}
+		} // END - if
+	} // END - if
 
 	// Add more bonus points here
 	$ADD = "";
@@ -77,45 +74,37 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
 	} // END - if
 
 	// SQL string to check for accounts
-	$result_main = SQL_QUERY_ESC("SELECT userid, email, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS active_bonus
+	$result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS points
 FROM "._MYSQL_PREFIX."_user_data
 ".$whereStatement1."".$ADD."
 ORDER BY active_bonus DESC, userid LIMIT %s",
  array($whereStatement2), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_main) > 0)
-	{
+	if (SQL_NUMROWS($result_main) > 0) {
 		// Load our winners...
-		$UIDs = "";
-		while(list($uid, $email, $points) = SQL_FETCHROW($result_main))
-		{
-			// Add userids in a row
-			$UIDs .= ",'".$uid."'";
-
-			// Add points to user's account directly
-			ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
-
-			// Load email template and email it away
-			$msg = LOAD_EMAIL_TEMPLATE("member_bonus", $points, bigintval($uid));
-			SEND_EMAIL($email, BONUS_MONTHLY_ONLINE_BONUS, $msg);
-		}
+		while ($content = SQL_FETCHARRAY($result_main)) {
+			// Make sure zero points are not mailed
+			if ($content['points'] > 0) {
+				// Add points to user's account directly
+				ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
 
-		// Remove first commata
-		$UIDs = substr($UIDs, 1);
+				// Translate gender
+				$content['gender'] = TRANSLATE_GENDER($content['gender']);
 
-		// Get current month
-		$curr = date("m", time());
-		if (strlen($curr) == 1) $curr = "0".$curr;
-		if ($curr == "00") $curr = "12";
+				// 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);
+			} // 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__);
-	}
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-}
+} // END - if
 
 //
 ?>
diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl
index d49a7e29fb..ed465eb304 100644
--- a/templates/de/emails/member/member_beg.tpl
+++ b/templates/de/emails/member/member_beg.tpl
@@ -1,6 +1,6 @@
 Hallo $content[gender] $content[surname] $content[family],
 
-Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
+Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content[points] {!POINTS!} gewonnen!
 
 Herzlichen Glueckwunsch!
 
diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl
index 643c954f47..b8d1031a61 100644
--- a/templates/de/emails/member/member_bonus.tpl
+++ b/templates/de/emails/member/member_bonus.tpl
@@ -1,6 +1,6 @@
 Hallo $content[gender] $content[surname] $content[family],
 
-Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
+Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content[points] {!POINTS!} gewonnen!
 
 Herzlichen Glueckwunsch!