X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=06fd11d42ff3b78b81f7f07f3d96b90db69258ae;hp=191ca68d942a92516f243970a0642454949f04f3;hb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;hpb=9cb3095b94feae69d53a847696c017ebda809212

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 191ca68d94..06fd11d42f 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -35,7 +35,7 @@
 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", true)) && (!IS_ADMIN())) {
 	// The extension "sql_patches" *MUST* be activated or you have lot's of problems!
 	LOAD_URL("modules.php?module=admin");
 }
@@ -48,6 +48,13 @@ LOAD_TEMPLATE("guest_header");
 
 // Add message here
 if (!empty($_GET['msg'])) {
+	// Default extension is "unknown"
+	$ext = "unknown";
+
+	// Is extension given?
+	if (!empty($_GET['ext'])) $ext = SQL_ESCAPE($_GET['ext']);
+
+	// Which message shall we output?
 	switch ($_GET['msg']) {
 		case CODE_LOGOUT_DONE      : $msg = LOGOUT_DONE; break;
 		case CODE_LOGOUT_FAILED    : $msg = "<SPAN class=\"guest_failed\">".LOGOUT_FAILED."</SPAN>"; break;
@@ -63,11 +70,6 @@ if (!empty($_GET['msg'])) {
 			break;
 
 		case CODE_EXTENSION_PROBLEM:
-			// Default extension is "unknown"
-			$ext = "unknown";
-
-			// Is extension given?
-			if (!empty($_GET['ext'])) $ext = SQL_ESCAPE($_GET['ext']);
 			$msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, $ext);
 			break;
 
@@ -75,7 +77,7 @@ if (!empty($_GET['msg'])) {
 		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;
-	}
+	} // END - switch
 
 	// Load message template
 	LOAD_TEMPLATE("message", false, $msg);
@@ -85,7 +87,7 @@ if (!empty($_GET['msg'])) {
 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'])) {
@@ -97,7 +99,7 @@ if (empty($GLOBALS['action'])) {
 }
 
 // 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']);
 } // END - if
@@ -105,6 +107,9 @@ if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 // TDs between menu and content
 LOAD_TEMPLATE("guest_menu_content");
 
+// Disable block-mode by default
+$BLOCK_MODE = false;
+
 $INC_ACTION = sprintf("%sinc/modules/guest/action-%s.php", PATH, $act);
 if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBALS['what']))) {
 	// Requested module is available so we load it
@@ -114,8 +119,8 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBAL
 	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?