X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Faction-task.php;h=40ee2efd50006a9d8203aad8c0e0e5ef162ec02a;hb=7720eafcce1bf3996657d7cb1a748b51a706b425;hp=1b9c69a78456a62895d62909559fece15e7b0f38;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6;p=mailer.git

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 1b9c69a784..40ee2efd50 100644
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/03/2004 *
- * ===============                              Last change: 08/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/03/2004 *
+ * ===================                          Last change: 08/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : action-task.php                                  *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,25 +38,26 @@
  ************************************************************************/
 
 // Some security stuff...
-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__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'task'));
-	return;
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
+
+if (!isExtensionActive('task')) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
+	return;
+} // END - if
 
 // 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_WHAT_404'), getWhat());
 }
 
-//
+// [EOF]
 ?>