Some internal TODOs fixed, rewrites to script inclusion

[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 5dd6f7b1cade9ec35eb77553c8191e742ffc5169..06b0b88efe446c5cb4868d3b663ff2e6b4f5cbf0 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
        return;
 }
 
@@ -44,12 +44,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
-       include($INC);
+       require($INC);
 } else {
-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
 }
 
 //