X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=d711852a584b67dbc8bb3b6dcf1e3df9f673cc44;hb=916bba4f00ee924f0d88b8fc273dee5bfb798aed;hp=9da2af3220a3ae6905880c4ec11b5917fc7d5e9d;hpb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;p=mailer.git diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index 9da2af3220..d711852a58 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -18,7 +18,7 @@ * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -39,142 +39,106 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; - require($INC); -} elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) { - addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('user')); - return; + die(); } // Add description as navigation point -ADD_DESCR('guest', __FILE__); +addMenuDescription('guest', __FILE__); -global $DATA; +if ((!isExtensionActive('user')) && (!isAdmin())) { + loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user')); + return; +} // END - if // Initialize variables $errorCode = 0; -$probe_nickname = false; -$uid = false; +$userid = false; $hash = ''; $URL = ''; $add = ''; // Already logged in? -if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) { +if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) { // Maybe, then continue with it - $uid = getUserId(); -} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (isFormSent())) { + $userid = getMemberId(); +} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) { // Set userid and crypt password when login data was submitted - if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) { + if ((isExtensionActive('nickname')) && (isNicknameOrUserid(postRequestElement('id')))) { // Nickname entered - $uid = SQL_ESCAPE(REQUEST_POST('id')); + $userid = SQL_ESCAPE(postRequestElement('id')); } else { // Direct userid entered - $uid = bigintval(REQUEST_POST('id')); + $userid = bigintval(postRequestElement('id')); } -} elseif (REQUEST_ISSET_POST(('new_pass'))) { +} elseif (isPostRequestElementSet('new_pass')) { // New password requested - $uid = 0; - if (REQUEST_ISSET_POST('id')) $uid = REQUEST_POST('id'); + $userid = 0; + if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id')); } else { // Not logged in - $uid = 0; $hash = ''; + $userid = 0; $hash = ''; } -// Set unset variables -if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', ''); -if (!REQUEST_ISSET_GET('login')) REQUEST_SET_GET('login' , ''); - -if (IS_MEMBER()) { +if (isMember()) { // Login immidiately... $URL = 'modules.php?module=login'; -} elseif ((isFormSent()) && (''.$uid.'' != ''.REQUEST_POST('id') . '')) { +} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) { // Invalid input (no nickname extension installed but nickname entered) $errorCode = getCode('EXTENSION_PROBLEM'); } elseif (isFormSent()) { // Try the login (see inc/libs/user_functions.php) - $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password')); -} elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) { + $URL = doUserLogin(postRequestElement('id'), postRequestElement('password')); +} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) { // Try the userid/email lookup (see inc/libs/user_functions.php) - $errorCode = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid); + $errorCode = doNewUserPassword(postRequestElement('email'), $userid); } // Login problems? -if (REQUEST_ISSET_GET('login')) { +if (isGetRequestElementSet('login')) { // Use code from URL - $errorCode = REQUEST_GET('login'); + $errorCode = getRequestElement('login'); } // END - if +// No problems, no output by detault +$content['message'] = ''; + // Login problems? if (!empty($errorCode)) { - // Ok, which one now? + // @TODO Move this HTML code into a template $message = "