Rewrites of more constants

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

diff --git a/inc/mails/_mails.php b/inc/mails/_mails.php
index f8cf83096ff9a4fb25a4611422fe6a983059d9d1..2bc6aa08a2682da8c4d67248f55e72b1afb03c4a 100644 (file)
--- a/inc/mails/_mails.php
+++ b/inc/mails/_mails.php
@@ -32,19 +32,15 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+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 (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
 
 //
 ?>