X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_;h=f39419727a0fdb2a79a771eb92eef0c7a6aceac5;hb=d6a5c97084d5e8f253b3f020db29494ab549e52f;hp=fa3bff08003d248b74097f807947fe39713b90d5;hpb=b73c135350d7ed266c0cac680105707139bd892d;p=mailer.git

diff --git a/inc/reset/reset_ b/inc/reset/reset_
index fa3bff0800..f39419727a 100644
--- a/inc/reset/reset_
+++ b/inc/reset/reset_
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/27/2004 *
- * ===============                              Last change: 12/27/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 12/27/2004 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_                                           *
@@ -10,9 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -33,15 +39,14 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!EXT_IS_ACTIVE("")) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+	die();
+} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
+} elseif (!isExtensionActive('')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (defined('__DAILY_RESET'))) return;
-
-//
+// [EOF]
 ?>