More language strings rewritten

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

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 08c5eaa5fffacf8d9c41be2d3088a340d2e378e1..cbbd29c4eda692623dca9b7d75eac6767466424d 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -32,25 +32,25 @@
  ************************************************************************/
 
 // 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);
+} elseif (!EXT_IS_ACTIVE("task")) {
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "task");
+       return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf(PATH."inc/modules/admin/what-%s.php", $GLOBALS['what']);
-if (file_exists($INC))
-{
+$INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
-       include($INC);
-}
- else
-{
-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       LOAD_INC($INC);
+} else {
+       addFatalMessage(getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
 }
+
 //
 ?>