Fixed saving of nickname, a deprecated way was used before isInString() was introduced

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

diff --git a/inc/reset/reset_engine.php b/inc/reset/reset_engine.php
index 9956a31eca2c54a28e525bdb804db01d5cd380e3..69a979cb6c48944a41122dc95cf4692684e758e0 100644 (file)
--- a/inc/reset/reset_engine.php
+++ b/inc/reset/reset_engine.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 12/27/2004 *
- * ===================                          Last change: 12/27/2004 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_engine.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,13 @@
 // 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('engine')) {
+       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;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // [EOF]
 ?>