All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

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

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 7cd95faabd5c686285da3c2481aa0e15cdc3f6ae..6aae2a04974f6b5d0914c817ef80dff5899a191a 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -32,34 +32,27 @@
  ************************************************************************/
 
 // 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_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-}
- elseif ($BLOCK_MODE)
-{
+} 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("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
-if (file_exists($INC_WHAT))
-{
+$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
+if (FILE_READABLE($INC)) {
        // 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);
+       LOAD_INC($INC);
+} else {
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
 }
+
 //
 ?>