All resets rewritten, missing svn:properties added

[mailer.git] / inc / monthly / monthly_newsletter.php

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index b9afcc916763b3cf5be37212c7bed1f7495adaf3..6527461b32c3a19481a1ee606cade8705b7bb341 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 03/04/2005 *
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 03/04/2005 *

- * ===================                          Last change: 03/04/2005 *
+ * ===================                          Last change: 06/20/2010 *

  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_newsletter.php                           *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_newsletter.php                           *


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

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

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

+       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() == 1) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-

 // [EOF]
 ?>
 // [EOF]
 ?>