is only supported in email templates and not required in member login area

[mailer.git] / inc / reset / reset_autopurge.php

diff --git a/inc/reset/reset_autopurge.php b/inc/reset/reset_autopurge.php
index f69af611b3cf0f85845eb9fd7496a18572494639..948f36fc45d1469e03de6d4b130cb70ce21bbf71 100644 (file)
--- 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,10 +14,9 @@
  * $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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,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-'));