X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Findex.php;h=64f88cce418a5b4fcfdd6de013d062448eccfab6;hb=f3e4c2c048761589836fdbe6bd2e46599a1833a7;hp=30a8b1ce8e486e0bc5e4d680e294031b12d297b4;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 30a8b1ce8e..64f88cce41 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Eingangsseite                                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,12 +37,12 @@
  ************************************************************************/
 
 // 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 (!EXT_IS_ACTIVE("sql_patches", true)) {
+} elseif (!EXT_IS_ACTIVE("sql_patches")) {
 	// The extension "sql_patches" *MUST* be activated or you have lot's of problems!
-	LOAD_URL("modules.php?module=admin");
+	LOAD_URL("admin.php");
 }
 
 // Load adverstising template
@@ -47,81 +52,69 @@ define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
 LOAD_TEMPLATE("guest_header");
 
 // Add message here
-if (!empty($_GET['msg'])) {
-	switch ($_GET['msg'])
-	{
-		case CODE_LOGOUT_DONE      : $msg = LOGOUT_DONE; break;
-		case CODE_LOGOUT_FAILED    : $msg = "<SPAN class=\"guest_failed\">".LOGOUT_FAILED."</SPAN>"; break;
-		case CODE_DATA_INVALID     : $msg = MAIL_DATA_INVALID; break;
-		case CODE_POSSIBLE_INVALID : $msg = MAIL_POSSIBLE_INVALID; break;
-		case CODE_ACCOUNT_LOCKED   : $msg = MEMBER_ACCOUNT_LOCKED_UNC; break;
-		case CODE_USER_404         : $msg = USER_NOT_FOUND; break;
-		case CODE_STATS_404        : $msg = MAIL_STATS_404; break;
-		case CODE_ALREADY_CONFIRMED: $msg = MAIL_ALREADY_CONFIRMED; break;
-		case CODE_ERROR_MAILID     : if (EXT_IS_ACTIVE("mailid", true)) { $msg = ERROR_CONFIRMING_MAIL; } else { $msg = sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"); } break;
-		case CODE_EXTENSION_PROBLEM: $msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, "mailid"); break;
-		case CODE_COOKIES_DISABLED : $msg = LOGIN_NO_COOKIES; break;
-		case CODE_BEG_SAME_AS_OWN  : $msg = BEG_SAME_UID_AS_OWN; break;
-		case CODE_LOGIN_FAILED     : $msg = LOGIN_FAILED_GENERAL; break;
-		default                    : $msg = UNKNOWN_MAILID_CODE_1.$_GET['msg'].UNKNOWN_MAILID_CODE_2; break;
-	}
+if (REQUEST_ISSET_GET(('msg'))) {
+	// Default extension is "unknown"
+	$ext = "unknown";
+
+	// Is extension given?
+	if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_GET(('ext'));
+
+	// Which message shall we output?
+	$msg = convertCodeToMessage(REQUEST_GET('msg'));
+
+	// Load message template
 	LOAD_TEMPLATE("message", false, $msg);
-}
+} // END - if
 
 // Some of you needs this to be extracted into a template... ???
 LOAD_TEMPLATE("guest_menu_td");
 
 // When no what value is provided take the "home" value
-if (empty($GLOBALS['what'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+if (empty($GLOBALS['what'])) $GLOBALS['what'] = getConfig('index_home');
 
 // Adding the main content module here
-if (empty($GLOBALS['action']))
-{
+if (empty($GLOBALS['action'])) {
 	// Get action value from what value
-	$act = GET_ACTION("guest", $GLOBALS['what']);
-}
- else
-{
-	// Get action value directly from URL
-	$act = COMPILE_CODE($GLOBALS['action']);
-}
+	$GLOBALS['action'] = GET_ACTION("guest", $GLOBALS['what']);
+} // END - if
 
 // Add the guest's menu here...
-if (($_CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
-{
+if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// Show only when guest menu is active
-	ADD_MENU("guest", $act, $GLOBALS['what']);
-}
+	ADD_MENU("guest", $GLOBALS['action'], $GLOBALS['what']);
+} // END - if
 
 // TDs between menu and content
 LOAD_TEMPLATE("guest_menu_content");
 
-$INC_ACTION = sprintf(PATH."inc/modules/guest/action-%s.php", $act);
-if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBALS['what'])))
-{
+// Disable block-mode by default
+$GLOBALS['block_mode'] = false;
+
+// Construct FQFN
+$INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);
+
+// Is the file there?
+if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
 	// Requested module is available so we load it
-	require_once($INC_ACTION);
-}
- else
-{
+	LOAD_INC_ONCE($INC);
+} else {
 	// Invalid module specified or not found...
 	LOAD_URL("modules.php?module=index");
 }
 
-if (($_CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
-{
-	// TDs between content and </table>
+if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+	// Right side of content (hint: a good place for 120x600 skyscraper banner!)
 	LOAD_TEMPLATE("guest_content_footer");
 
 	// Some advertising stuff?
 	LOAD_TEMPLATE("guest_advert2");
 
-	OUTPUT_HTML("  </TD>
-</TR>");
+	OUTPUT_HTML("  </td>
+</tr>");
 
 	// Goto TOP template
 	LOAD_TEMPLATE("guest_goto_top");
-}
+} // END - if
 
 // Footer template (Thanx to Mr. Glaus!)
 LOAD_TEMPLATE("guest_footer");