GUEST_404_ACTION is now renamed to GUEST_404_WHAT

[mailer.git] / inc / modules / guest / action-main.php

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 4c89048ccd56657555c6dd83e3050343d15bb011..9e3f95d37d0f02d10ce48f3f4266839f691f6789 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Hauptmenue: Anmeldung, Login, Willkommen usw.    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,27 +37,25 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
+} elseif (isBlockModeEnabled()) {
+       // Block mode detected
+       return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR('guest', __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
-$IS_VALID = WHAT_IS_VALID(GET_ACTION("guest", $GLOBALS['what']), $GLOBALS['what'], "guest");
-
-if (FILE_READABLE($INC)) && ($IS_VALID)) {
+$INC = sprintf("inc/modules/guest/what-%s.php", getWhat());
+if (isIncludeReadable($INC)) {
        // Ok, we finally load the guest action module
-       require_once($INC);
-} elseif ($IS_VALID) {
-       ADD_FATAL(GUEST_404_ACTION_1.$GLOBALS['what'].GUEST_404_ACTION_2);
+       loadInclude($INC);
 } else {
-       ADD_FATAL(GUEST_LOCKED_ACTION);
+       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
 }
 
-//
+// [EOF]
 ?>