Fix for rewrite

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 6b3d1ad13f09bdc8ec33ecf0e051ab4cdd02f8a2..75542597049218dbc545a3630700c7877ad3b06e 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) {
+} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') != 'Y')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index 43b1eaa1c331fb61a22b0be061bbf5513acee1cb..6a28959a95efd8b3e976f15949cefcf574104cc6 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('beg_rallye') == 'Y')) {
+} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') == 'Y')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }

diff --git a/inc/reset/reset_doubler.php b/inc/reset/reset_doubler.php
index 11bc8ce134d4f34ad9e50fa6440f9aedcf01f709..a31687289d54a64e9b1c5308307bb0ddc40a0e84 100644 (file)
--- a/inc/reset/reset_doubler.php
+++ b/inc/reset/reset_doubler.php
@@ -40,10 +40,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('doubler_send_mode') != 'RESET')) {
+} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
-} elseif (!isExtensionActive('doubler')) {
+} elseif ((!isExtensionActive('doubler')) || (getConfig('doubler_send_mode') != 'RESET')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }