Missed this

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 9f24556139a203cacc84692953fab7b6dfbf17e8..0d6dd424bdc0aa30dedc16992a6fa9ab826201de 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,11 +38,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
-       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
+       if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.');
        return;
 }
 
@@ -55,9 +55,9 @@ if ((getBegRanks() > 0) && (!isCssOutputMode())) {
        $whereStatement = '';
 
        // Shall we exclude webmaster's own userid?
-       if ((!isBegIncludeOwnEnabled()) && (isValidUserId(getBegUserid()))) {
+       if ((!isBegIncludeOwnEnabled()) && (isValidId(getBegUserid()))) {
                // Exclude it
-               $whereStatement = " AND `userid` != {?beg_userid?}";
+               $whereStatement .= ' AND `userid` != {?beg_userid?}';
        } // END - if
 
        // Let's check if there are some points left we can pay...
@@ -73,7 +73,9 @@ if ((getBegRanks() > 0) && (!isCssOutputMode())) {
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED'" . $whereStatement . " AND
+       `status`='CONFIRMED'
+       " . $whereStatement . "
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND
        `beg_points` > 0
 ORDER BY
        `beg_points` DESC,