Security line in all includes changed

[mailer.git] / inc / modules / admin / action-email.php

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index a2a221c90f03a1c68a67fae1e5517f2c139d4c73..3c2d83513ec2e59efa5080bbb39a8f2b1490733e 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -43,14 +42,12 @@ ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
 $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
-if (file_exists($INC))
-{
+if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
-}
- else
-{
+} else {
        ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
 }
+
 //
 ?>