Added separate debugging of 'hourly' reset

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 527508c8d732047db7b12b420fc406012de40aad..d284b5eabd691bff3cc24bb260ff3f74935802cd 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -55,6 +55,7 @@ function initConfig () {
                'num_templates'       => 0,
                // 'DEFAULT_SALT_LENGTH' => 40,
                // 'DEBUG_MODE'          => 'N',
+               // 'DEBUG_HOURLY'        => 'N',
                // 'DEBUG_RESET'         => 'N',
                // 'DEBUG_MONTHLY'       => 'N',
                // 'DEBUG_WEEKLY'        => 'N',

diff --git a/inc/config-local.php.dist b/inc/config-local.php.dist
index ebd74c4acca5346c09d02e43c3444724cf738009..49063403bf76f1aa7f1132b77c4dd57551aed981 100644 (file)
--- a/inc/config-local.php.dist
+++ b/inc/config-local.php.dist
@@ -89,6 +89,9 @@ setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N');
 // CFG: DEBUG-SQL (Logs all queries to inc/cache/mysql.log)
 //setConfigEntry('DEBUG_SQL', 'Y');
 
+// CFG: DEBUG-HOURLY (comment in to test hourly reset, comment out to not test)
+//setConfigEntry('DEBUG_HOURLY', 'Y');
+
 // CFG: DEBUG-RESET (comment in to test daily reset, comment out to not test)
 //setConfigEntry('DEBUG_RESET', 'Y');
 

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

diff --git a/inc/filters.php b/inc/filters.php
index 987d89326a400dc245781cbb4c87b923cc81953e..78aef62f1f71b4b1a60c55ebcea6b5612e57ed59 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -590,7 +590,7 @@ function FILTER_RUN_HOURLY_INCLUDES () {
        setIncludePool('hourly', getArrayFromDirectory('inc/hourly/', 'hourly_'));
 
        // Update database
-       if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) {
+       if ((!isConfigEntrySet('DEBUG_HOURLY')) || (!isDebugHourlyEnabled())) {
                updateConfiguration('last_hour', getHour());
        } // END - if
 
@@ -825,7 +825,7 @@ function FILTER_RUN_HOURLY_RESET () {
        } // END - if
 
        // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-       if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
+       if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugHourlyEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
                // Tell every module we are in reset-mode!
                doHourly();
        } // END - if

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 25e188c4821130a314824b6fb4401dba595962b2..db7fa084b3a6a2394fd907b56f365cf5bdfa156b 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -407,6 +407,18 @@ function isDebugModeEnabled () {
        return $GLOBALS[__FUNCTION__];
 }
 
+// Checks whether the debug hourly is enabled
+function isDebugHourlyEnabled () {
+       // Is cache set?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Simply check it
+               $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('DEBUG_HOURLY')) && (getConfig('DEBUG_HOURLY') == 'Y'));
+       } // END - if
+
+       // Return it
+       return $GLOBALS[__FUNCTION__];
+}
+
 // Checks whether the debug reset is enabled
 function isDebugResetEnabled () {
        // Is cache set?