X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=6180e3e9416df571a71fffe6e163713f1bb3fc0b;hb=641ca2a3526aa0612781dddf83dd77dbb003adff;hp=366c6d16c7db47a46d1b6802ab9ebcc8fe9828e0;hpb=4ef4c88fc481335dc0631b223111c15a84cccb51;p=mailer.git

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 366c6d16c7..6180e3e941 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -32,10 +32,10 @@
  ************************************************************************/
 
 // 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", 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;
@@ -57,13 +64,20 @@ if (!empty($_GET['msg'])) {
 		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_ERROR_MAILID:
+			if (EXT_IS_ACTIVE($ext, true)) { $msg = ERROR_CONFIRMING_MAIL; } else { $msg = sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"); }
+			break;
+
+		case CODE_EXTENSION_PROBLEM:
+			$msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, $ext);
+			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;
-	}
+	} // END - switch
 
 	// Load message template
 	LOAD_TEMPLATE("message", false, $msg);
@@ -73,19 +87,19 @@ 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'])) {
 	// 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
+
+// Get action value directly from URL
+$act = COMPILE_CODE($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
@@ -93,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
@@ -102,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?