X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_beg.php;h=d56d0108ba618c118695f4a0b9e840da0de05016;hb=03f62d0b89aa9276ac37f4d616d940fae184d850;hp=dac9ff1b8cebf67c1b56dcd753c65aa60a720b1b;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index dac9ff1b8c..d56d0108ba 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -45,20 +45,20 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != "Y")) return;
+if ((getOutputMode() == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
-$curr = date("m", time());
+$curr = date('m', time());
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($GLOBALS['output_mode'] != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getOutputMode() != 1)) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = '';
 	$whereStatement2 = getConfig(('beg_ranks'));
 
 	// Shall we exclude webmaster's own userid?
-	if ((getConfig('beg_include_own') != "Y") && (getConfig('beg_uid') > 0)) {
+	if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_uid') > 0)) {
 		// Exclude it
 		$whereStatement1 = sprintf(" AND userid != %s", getConfig(('beg_uid')));
 	} // END - if
@@ -68,7 +68,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 		// Use last online stamp only when autopurge for inactive members is activated
 		if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == 'Y')) {
 			// Okay, include last online timestamp
-			$whereStatement1 .= sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig(('ap_inactive_since')));;
+			$whereStatement1 .= sprintf(" AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig(('ap_inactive_since')));;
 		} // END - if
 	} // END - if
 
@@ -78,21 +78,21 @@ FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE `status`='CONFIRMED'".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 LIMIT %s",
-		array($whereStatement2), __FILE__, __LINE__);
+	array($whereStatement2), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result_main) > 0) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Add points to user's account directly
-			ADD_POINTS_REFSYSTEM("monthly_beg", $content['userid'], $content['points'], false, "0", false, "direct");
+			ADD_POINTS_REFSYSTEM_DIRECT('monthly_beg', $content['userid'], $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_beg", $content, bigintval($content['userid']));
-			SEND_EMAIL($content['email'], BEG_MONTHLY_RALLYE, $msg);
+			sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $msg);
 		} // END - while
 
 		// Reset accounts