else-block removed

[mailer.git] / inc / mails / _mails.php

diff --git a/inc/mails/_mails.php b/inc/mails/_mails.php
index f8cf83096ff9a4fb25a4611422fe6a983059d9d1..9b0e67c412820bb11590f5966ceb7af7f073c013 100644 (file)
--- a/inc/mails/_mails.php
+++ b/inc/mails/_mails.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,19 +37,15 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN()))
-{
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+} elseif (!EXT_IS_ACTIVE('')) {
        return;
 }
 
 // Do not execute when script is in CSS mode
-if ($CSS == 1) return;
+if ((getOutputMode() == 1) || (!isResetModeEnabled())) return;
 
 //
 ?>