Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index b78e4783b0d26c6118c433c99747239533a6bad6..6407fa2fcea909b4253d1ee5d82cdcbb5bc47f57 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -38,15 +38,15 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // 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']);
+$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);
 }
 
 //