Added separate debugging of 'hourly' reset

[mailer.git] / inc / daily / daily_user.php

diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php
index a1637f1dd3b1095b62f70c91d7b45d8ee81a5810..35483f6a7637e922424e7e665d2814d0f4e9fd12 100644 (file)
--- a/inc/daily/daily_user.php
+++ b/inc/daily/daily_user.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('sql_patches')) {
+} elseif ((!isExtensionActive('sql_patches')) || (!isExtensionActive('user'))) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) ext-sql_patches/ext-user disabled.');
        return;
 }
@@ -58,7 +58,8 @@ SET
        `receive_mails`=`max_mails`,
        `mail_orders`=0
 WHERE
-       `receive_mails` != `max_mails`', __FILE__, __LINE__);
+       `receive_mails` != `max_mails`
+       ' . runFilterChain('user_exclusion_sql', ' ') . '', __FILE__, __LINE__);
 } else {
        // Obsolete version
        SQL_QUERY('UPDATE
@@ -66,7 +67,8 @@ WHERE
 SET
        `receive_mails`=`max_mails`
 WHERE
-       `receive_mails` != `max_mails`', __FILE__, __LINE__);
+       `receive_mails` != `max_mails`
+       ' . runFilterChain('user_exclusion_sql', ' ') . '', __FILE__, __LINE__);
 }
 
 // Transfer points from locked_points to points