Complete rewrite of and , wrapper functions added, see bug #101

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

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 48222b8e639b3e56459b1b6c90df056f081dffa7..3c263d3491867443aa2fbcd825af9ae1d37654be 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -32,22 +32,21 @@
  ************************************************************************/
 
 // 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);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
-if (FILE_READABLE($INC)) {
+$INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (INCLUDE_READABLE($INC)) {
        // Ok, we finally load the admin action module
-       include($INC);
+       LOAD_INC($INC);
 } else {
-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
 
 //