From: Roland Häder <roland@mxchange.org>
Date: Sun, 20 Jun 2010 14:45:44 +0000 (+0000)
Subject: Fix for rewrite
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c2f2d0e0c53b6b4878f5966cf954f2f4cf1dff86;p=mailer.git

Fix for rewrite
---

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 6b3d1ad13f..7554259704 100644
--- 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 43b1eaa1c3..6a28959a95 100644
--- 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 11bc8ce134..a31687289d 100644
--- 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;
 }