* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
// Some security stuff...
if (!defined('__SECURITY')) {
- die();
+ exit();
} // END - if
// Add description as navigation point
// Initialize variables
$errorCode = '0';
-$userid = false;
+$userid = FALSE;
$hash = '';
$url = '';
$add = '';
if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
// Maybe, then continue with it
$userid = getMemberId();
-} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
+} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent('login'))) {
// Set userid and crypt password when login data was submitted
if (isNicknameUsed(postRequestElement('id'))) {
// Nickname entered
// Email is set
$userid = SQL_ESCAPE(postRequestElement('email'));
} elseif (isPostRequestElementSet('id')) {
- // Do we have nickname or userid?
+ // Is there nickname or userid?
if (isNicknameUsed(postRequestElement('id'))) {
// Nickname entered
$userid = SQL_ESCAPE(postRequestElement('id'));
if (isMember()) {
// Login immidiately...
$url = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
+} elseif ((isFormSent('login')) && ('' . $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 = doUserLogin(postRequestElement('id'), postRequestElement('password'));
+} elseif (isFormSent('login')) {
+ // Are both 'id' and 'password' set?
+ if ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
+ // Try the login (see inc/libs/user_functions.php)
+ $url = doUserLogin(postRequestElement('id'), postRequestElement('password'));
+ } elseif (!isPostRequestElementSet('id')) {
+ // Empty 'id'
+ $errorCode = getCode('LOGIN_EMPTY_ID');
+ } else {
+ // Empty 'password'
+ $errorCode = getCode('LOGIN_EMPTY_PASSWORD');
+ }
} elseif ((isPostRequestElementSet('new_pass')) && (!empty($userid))) {
// Try the userid/email lookup (see inc/libs/user_functions.php)
$errorCode = doNewUserPassword(postRequestElement('email'), $userid);
// Login problems?
if (!empty($errorCode)) {
- // Do we have a userid set?
- if (isSessionVariableSet('current_userid')) {
+ // Is there a userid set?
+ if (isSessionVariableSet('userid')) {
// Then prefetch data for this account
- fetchUserData(getSession('current_userid'));
+ fetchUserData(getSession('userid'));
} // END - if
// @TODO Move this HTML code into a template
- $content['message'] = '<tr>
- <td colspan="4" align="center">
- <span class="bad">' . getMessageFromErrorCode($errorCode) . '</span>
- </td>
-</tr>';
+ $content['message'] = loadTemplate('guest_login_error_message', TRUE, $errorCode);
} // END - if
// Display login form with resend-password form
if (isExtensionActive('nickname')) {
- loadTemplate('guest_nickname_login', false, $content);
+ loadTemplate('guest_nickname_login', FALSE, $content);
} else {
- loadTemplate('guest_login', false, $content);
+ loadTemplate('guest_login', FALSE, $content);
}
// Was an URL constructed?