Mahor rewrite:

[mailer.git] / inc / monthly / monthly_beg.php

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index ecc3c3ed927a22eb85bbba443bdc61f661ffe1eb..237c5917b6f979797ae962e3df1b2a9037f9500c 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -40,25 +40,30 @@ 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 (($CSS == 1) || (!defined('__DAILY_RESET')) || (getConfig('beg_rallye') == "N")) 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) && ($CSS != 1)) {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "";
-       $whereStatement2 = bigintval($_CONFIG['beg_ranks']);
+       $whereStatement2 = bigintval(getConfig('beg_ranks'));
+
+       // Shall we exclude webmaster's own userid?
+       if ((getConfig('beg_include_own') == "N") && (getConfig('beg_uid') > 0)) {
+               // Exclude it
+               $whereStatement1 = sprintf(" AND userid != %s", bigintval(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)", bigintval(getConfig('ap_inactive_since')));;
                } // END - if
        } // END - if