X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=6e71c9176a07bfedbe98493bd4197c0e0f2e6ef3;hb=3c311675e341584ad25c561a5a65198f3717125f;hp=4e91d9ede50d718c4f0cc8707c7971194b79240c;hpb=6b13c5c64eebedd56683c78d799879e0dc618b21;p=mailer.git diff --git a/inc/modules/login.php b/inc/modules/login.php index 4e91d9ede5..6e71c9176a 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -39,9 +39,8 @@ if (!defined('__SECURITY')) { die(); } elseif (!isMember()) { - $url = 'modules.php?module=index'; - if (checkModulePermissions('login') == 'mem_only') $url .= '&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule(); - redirectToUrl($url); + // Redirect to login form with displayed error code + redirectToUrl('modules.php?module=index&what=login&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule()); } // END - if // Disable block mode by default @@ -58,7 +57,9 @@ loadTemplate('member_menu_start'); // Adding the main content module here if (!isActionSet()) { - if (!isWhatSet()) setWhat('welcome'); + if (!isWhatSet()) { + setWhat('welcome'); + } // END - if } else { $action = getAction(); } @@ -72,8 +73,8 @@ if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true enableBlockMode(false); // Menu -> content -outputHtml(" - "); +outputHtml(' + '); $inc = sprintf("inc/modules/member/action-%s.php", $action); if ((isIncludeReadable($inc)) && (isMenuActionValid('member', getAction(), getWhat()))) { @@ -90,10 +91,10 @@ if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true // Some advertising stuff? loadTemplate('member_advert'); -} +} // END - if -outputHtml(" -"); +outputHtml(' +'); // Load same template for 'Goto TOP' loadTemplate('member_goto_top'); @@ -101,5 +102,5 @@ loadTemplate('member_goto_top'); // Footer template (Thanx to Mr. Glaus!) loadTemplate('member_footer'); -// +// [EOF] ?>