X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=d243864380b7c7ac61d1988e9511158d0d5a89e6;hp=ecc3c3ed927a22eb85bbba443bdc61f661ffe1eb;hb=fb7120ffa230b62b54895bcf95952e1cf30f8594;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index ecc3c3ed92..d243864380 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                  *
@@ -40,32 +45,37 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N")) return;
+if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != "Y")) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $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 != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && ($GLOBALS['output_mode'] != 1)) {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "";
-	$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
+	$whereStatement2 = getConfig(('beg_ranks'));
+
+	// Shall we exclude webmaster's own userid?
+	if ((getConfig('beg_include_own') != "Y") && (getConfig('beg_uid') > 0)) {
+		// Exclude it
+		$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")) {
 		// Use last online stamp only when autopurge for inactive members is activated
-		if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['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($_CONFIG['ap_inactive_since']));;
-			$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
+			$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
+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__);
@@ -86,7 +96,7 @@ LIMIT %s",
 		} // 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