Security line in all includes changed

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

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index f350201a79552ecbef74bd9317c9c697e74fd6b7..23a589444e17f80fddd300456317352b9de9e34d 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -32,7 +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);
 }
@@ -42,7 +42,7 @@ ADD_DESCR("admin", basename(__FILE__));
 
 // Load the include file
 $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
-if ((file_exists($INC)) && (is_readable($INC))) {
+if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {