Fix for endless loop

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

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index b5c1174f83ec39a8ede18bc56aa866dfd2c7287a..6eee351e8b96545feee364a20f5d29ab0845df2e 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  :                                                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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 *
@@ -33,29 +38,30 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-} elseif (!IS_LOGGED_IN()) {
-       LOAD_URL(URL."/modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, EXTENSION_PROBLEM_EXT_INACTIVE, "");
-       return;
-} elseif ($BLOCK_MODE) {
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('')) && (!isAdmin())) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage(''));
+       return;
+} // END - if
 
 // Load the include file
-$INC = sprintf("inc/modules/member/what-%s.php", SQL_ESCAPE($GLOBALS['what']));
-if (FILE_READABLE($INC)) {
+$inc = sprintf("inc/modules/member/what-%s.php", getWhat());
+if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
-       LOAD_INC($INC);
+       loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('MEMBER_404_ACTION'), $GLOBALS['what']));
+       addFatalMessage(__FILE__, __LINE__, getMessage('MEMBER_404_ACTION'), getWhat());
 }
 
-//
+// [EOF]
 ?>