Some more fixes and dependency between bonus<->sql_patches

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 34fa872965644e9aa84473d3e078cc6a74b28ff6..2826065fbec20b050a5ce704c0dc5766b613a090 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,12 +50,12 @@ if (!defined('__SECURITY')) {
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
 // Check if month is done
-if ((getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
+if ((getBegRanks() > 0) && (!isCssOutputMode())) {
        // 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') && (isValidUserId(getConfig('beg_userid')))) {
+       if ((!isBegIncludeOwnEnabled()) && (isValidUserId(getBegUserid()))) {
                // Exclude it
                $whereStatement1 = " AND `userid` != {?beg_userid?}";
        } // END - if
@@ -63,7 +63,7 @@ if ((getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
        // Let's check if there are some points left we can pay...
        if (isExtensionActive('autopurge')) {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ((getApInactiveSince() > 0) && (getConfig('beg_active') == 'Y')) {
+               if ((getApInactiveSince() > 0) && (isBegActiveEnabled()) {
                        // Okay, include last online timestamp
                        $whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
                } // END - if