All resets rewritten, missing svn:properties added

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

diff --git a/inc/reset/reset_autopurge.php b/inc/reset/reset_autopurge.php
index 9a8ed12de16fa3eb5a29cb191e21efc8750b5900..586dfbb4b6883f09303b6fc6ea6e83c29cf4f5c9 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 *
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/27/2009 *

- * ===================                          Last change: 10/27/2009 *
+ * ===================                          Last change: 06/20/2010 *

  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_autopurge.php                              *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_autopurge.php                              *


@@ -40,13 +40,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();

+} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+       // Do not execute when script is in CSS mode or no daily reset
+       return;

 } elseif (!isExtensionActive('autopurge')) {
 } elseif (!isExtensionActive('autopurge')) {

+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');

        return;
 }
 
        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-'));
 // Init & set the include pool
 initIncludePool('autopurge');
 setIncludePool('autopurge', getArrayFromDirectory('inc/autopurge/', 'purge-'));