X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_autopurge.php;h=948f36fc45d1469e03de6d4b130cb70ce21bbf71;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=9a8ed12de16fa3eb5a29cb191e21efc8750b5900;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/reset/reset_autopurge.php b/inc/reset/reset_autopurge.php
index 9a8ed12de1..948f36fc45 100644
--- a/inc/reset/reset_autopurge.php
+++ b/inc/reset/reset_autopurge.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/27/2009 *
- * ===================                          Last change: 10/27/2009 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_autopurge.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,13 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
 } elseif (!isExtensionActive('autopurge')) {
+	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())) return;
-
 // Init & set the include pool
 initIncludePool('autopurge');
 setIncludePool('autopurge', getArrayFromDirectory('inc/autopurge/', 'purge-'));