X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_beg.php;h=2dd0f14d075d4da06c94c06be8db32fdae7b16e3;hb=3f51c40f4fede87228216f9285b745a339e3891d;hp=292eb5befcbc34deb27b0684b55dedff0b90fea5;hpb=cc7c700143bca2420ff0497e648d31a18cc9add2;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 292eb5befc..2dd0f14d07 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatliche Bettelrallye                          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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,65 +38,67 @@
 
 // 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("beg")) {
+} elseif (!EXT_IS_ACTIVE('beg')) {
 	return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET')) || (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) && ($CSS != 1)) {
-	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
-	$whereStatement1 = "";
-	$whereStatement2 = bigintval(getConfig('beg_ranks'));
+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 = '';
 
 	// 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", bigintval(getConfig('beg_uid')));
+		$whereStatement1 = sprintf(" AND `userid` != %s", getConfig('beg_uid'));
 	} // END - if
 
-	// Let's check if there are some points left we can "pay"...
-	if (EXT_IS_ACTIVE("autopurge")) {
+	// Let's check if there are some points left we can 'pay'...
+	if (EXT_IS_ACTIVE('autopurge')) {
 		// Use last online stamp only when autopurge for inactive members is activated
-		if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == "Y")) {
+		if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == 'Y')) {
 			// Okay, include last online timestamp
-			$whereStatement1 .= sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval(getConfig('ap_inactive_since')));;
+			$whereStatement1 .= sprintf(" AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
 		} // END - if
 	} // END - if
 
 	// SQL string to check for accounts
-	$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
+	$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` ASC
 LIMIT %s",
-		array($whereStatement2), __FILE__, __LINE__);
+		array(getConfig('beg_ranks')), __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);
+			$msg = LOAD_EMAIL_TEMPLATE('member_beg', $content, bigintval($content['userid']));
+			sendEmail($content['email'], getMessage('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__);
+		$result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0", __FILE__, __LINE__);
 	} // END - if
 
 	// Free memory