X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=366c6d16c7db47a46d1b6802ab9ebcc8fe9828e0;hp=f73e2c23f99b208726c70d59b5076861ab97ae47;hb=7967841ac94cdcbd10b4d5c011a1e0a9982ec600;hpb=e1653405d28923c78b2e292125306ccf61138f24

diff --git a/inc/modules/index.php b/inc/modules/index.php
index f73e2c23f9..366c6d16c7 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -32,21 +32,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$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)) {
 	// The extension "sql_patches" *MUST* be activated or you have lot's of problems!
-	LOAD_URL(URL."/modules.php?module=admin");
-}
-
-// When the frameset is active redirect the user :)
-if (frameset_active)
-{
-	LOAD_URL(URL."/modules.php?module=frameset");
+	LOAD_URL("modules.php?module=admin");
 }
 
 // Load adverstising template
@@ -56,10 +47,8 @@ define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
 LOAD_TEMPLATE("guest_header");
 
 // Add message here
-if (!empty($_GET['msg']))
-{
-	switch ($_GET['msg'])
-	{
+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;
@@ -75,63 +64,57 @@ if (!empty($_GET['msg']))
 		case CODE_LOGIN_FAILED     : $msg = LOGIN_FAILED_GENERAL; break;
 		default                    : $msg = UNKNOWN_MAILID_CODE_1.$_GET['msg'].UNKNOWN_MAILID_CODE_2; break;
 	}
+
+	// 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'] = $_CONFIG['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
-{
+} else {
 	// 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 (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// Show only when guest menu is active
 	ADD_MENU("guest", $act, $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'])))
-{
+$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
 	require_once($INC_ACTION);
-}
- else
-{
+} else {
 	// Invalid module specified or not found...
-	LOAD_URL(URL."/modules.php?module=index");
+	LOAD_URL("modules.php?module=index");
 }
 
-if (($CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true)))
-{
+if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// TDs between content and </table>
 	LOAD_TEMPLATE("guest_content_footer");
 
 	// Some advertising stuff?
 	LOAD_TEMPLATE("guest_advert2");
 
-	OUTPUT_HTML ("  </TD>
+	OUTPUT_HTML("  </TD>
 </TR>");
 
 	// Goto TOP template
 	LOAD_TEMPLATE("guest_goto_top");
-}
+} // END - if
 
 // Footer template (Thanx to Mr. Glaus!)
 LOAD_TEMPLATE("guest_footer");