Heavy rewrite:

[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 d5bdfce2532cc59c99a04968b294f79fea57eaca..798fba3f457a1eef1f9d73738840a0d4c7143974 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -46,12 +46,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());
 }
 
 //