X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_doubler.php;h=4d9d8db77b44d4059d89fa8af65e1fc0746abff5;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=8eaf68c8631b1805abab13a14812b138882cf13c;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/reset/reset_doubler.php b/inc/reset/reset_doubler.php
index 8eaf68c863..4d9d8db77b 100644
--- a/inc/reset/reset_doubler.php
+++ b/inc/reset/reset_doubler.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/24/2009 *
- * ===================                          Last change: 10/24/2009 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_doubler.php                                *
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,14 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (!isExtensionActive('doubler')) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
+} elseif ((!isExtensionActive('doubler')) || (getConfig('doubler_send_mode') != 'RESET')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('doubler_send_mode') != 'RESET')) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // Include it
 loadIncludeOnce('inc/mails/doubler_mails.php');