Some internal TODOs fixed, rewrites to script inclusion

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

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index dfd0538542f64375a7098b7d056fc4f49bfa6966..7fcb665657897a4e9dcea8737a76602251da7105 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -12,7 +12,7 @@
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003, 2004, 2005, 2006, 2007 by Roland Haeder          *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,34 +32,30 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
+} elseif (!IS_LOGGED_IN()) {
        LOAD_URL(URL."/modules.php?module=index");
-}
- elseif ($BLOCK_MODE)
-{
+} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       return;
+} elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf(PATH."inc/modules/member/what-%s.php", $GLOBALS['what']);
-if (file_exists($INC_WHAT))
-{
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
+if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
-       include_once($INC_WHAT);
-}
- else
-{
-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       require($INC_WHAT);
+} else {
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
 }
+
 //
 ?>