Fixes for rallye, thanks to WernisMan

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

diff --git a/inc/modules/admin/action- b/inc/modules/admin/action-
index 044af67da2036ac9f88659d345ee1bf86dd63f07..cfe45205560aa28fbaf527a8f766167918a2ea12 100644 (file)
--- a/inc/modules/admin/action-
+++ b/inc/modules/admin/action-
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,22 +37,21 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Load the include file
-$INC = sprintf("inc/modules/admin/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_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__, ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_WHAT_404'), getWhat()));
 }
 
-//
+// [EOF]
 ?>