* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
$errorCode = '0';
$userid = false;
$hash = '';
-$URL = '';
+$url = '';
$add = '';
// Already logged in?
$userid = getMemberId();
} elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
// Set userid and crypt password when login data was submitted
- if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
+ if (isExtensionActive('nickname')) {
// Nickname entered
$userid = SQL_ESCAPE(postRequestParameter('id'));
} else {
} elseif (isPostRequestParameterSet('new_pass')) {
// New password requested
$userid = '0';
- if ((isPostRequestParameterSet('id')) && (postRequestParameter('id') > 0)) $userid = bigintval(postRequestParameter('id'));
+ if (isPostRequestParameterSet('id')) {
+ // Do we have nickname or userid?
+ if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
+ // Nickname entered
+ $userid = SQL_ESCAPE(postRequestParameter('id'));
+ } else {
+ // Direct userid entered
+ $userid = bigintval(postRequestParameter('id'));
+ }
+ } // END - if
} else {
// Not logged in
$userid = '0'; $hash = '';
if (isMember()) {
// Login immidiately...
- $URL = 'modules.php?module=login';
+ $url = 'modules.php?module=login';
} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('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(postRequestParameter('id'), postRequestParameter('password'));
+ $url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
} elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
// Try the userid/email lookup (see inc/libs/user_functions.php)
$errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
// Login problems?
if (!empty($errorCode)) {
- // @TODO Move this HTML code into a template
- $message = "<tr>
- <td width=\"10\" class=\"seperator\"> </td>
- <td colspan=\"7\" align=\"center\">
- <span class=\"guest_failed\">";
-
// Do we have a userid set?
if (isSessionVariableSet('current_userid')) {
// Then prefetch data for this account
fetchUserData(getSession('current_userid'));
} // END - if
- // Convert the code to message
- $message .= getMessageFromErrorCode($errorCode);
-
- // Continue with HTML
- $message .= "</span>
+ // @TODO Move this HTML code into a template
+ $content['message'] = '<tr>
+ <td colspan="4" align="center">
+ <span class="notice">' . getMessageFromErrorCode($errorCode) . '</span>
</td>
- <td width=\"10\" class=\"seperator\"> </td>
-</tr>\n";
- $content['message'] = $message;
+</tr>';
} // END - if
// Display login form with resend-password form
}
// Was an URL constructed?
-if (!empty($URL)) {
+if (!empty($url)) {
// URL was constructed
- if (getTotalFatalErrors() > 0) {
+ if (ifFatalErrorsDetected()) {
// Handle fatal errors
runFilterChain('handle_fatal_errors');
} else {
// Load URL
- redirectToUrl($URL);
+ redirectToUrl($url);
}
} // END - if