Heavy rewrite:

[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 a585c5fd6a3521c027dd3e984dde2ed31031087b..bdc3fe5402b71c56519b737b0fdf1fd2c44b679a 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -41,7 +41,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')) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'task');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
        return;
 }
 
@@ -49,12 +49,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (INCLUDE_READABLE($INC)) {
+$INC = sprintf("inc/modules/admin/what-%s.php", getWhat());
+if (isIncludeReadable($INC)) {
        // Ok, we finally load the admin action module
-       LOAD_INC($INC);
+       loadInclude($INC);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_ACTION_404'), $GLOBALS['what']);
+       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_ACTION_404'), getWhat());
 }
 
 //