X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Flogin.php;h=2835d7950636d39b064aec8223707ccc8fe0e9ce;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hp=4e91d9ede50d718c4f0cc8707c7971194b79240c;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git diff --git a/inc/modules/login.php b/inc/modules/login.php index 4e91d9ede5..2835d79506 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 - 2016 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 * @@ -37,18 +37,17 @@ // Some security stuff... if (!defined('__SECURITY')) { - die(); + exit(); } 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 -enableBlockMode(false); +enableBlockMode(FALSE); // Generate a tableset for the menu title and content -loadTemplate('member_header', false, array('date_time' => generateDateTime(time(), 1))); +loadTemplate('member_header', FALSE, array('date_time' => generateDateTime(time(), 1))); // Add code-message here handleCodeMessage(); @@ -58,24 +57,26 @@ 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(); } // Add the member's menu here... -if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) { +if ((isMemberMenuEnabled()) || (!isExtensionActive('sql_patches', TRUE))) { addMenu('member', getActionFromModuleWhat('member', getWhat()), getWhat()); } // END - if // Disable block-mode again -enableBlockMode(false); +enableBlockMode(FALSE); // Menu -> content -outputHtml(" -