$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
} elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) {
- addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user'));
+ addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('user'));
return;
}
if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
// Maybe, then continue with it
$uid = getUserId();
-} elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
+} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (isFormSent())) {
// Set userid and crypt password when login data was submitted
if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
// Nickname entered
} elseif (REQUEST_ISSET_POST(('new_pass'))) {
// New password requested
$uid = 0;
- if (REQUEST_ISSET_POST(('id'))) $uid = REQUEST_POST('id');
+ if (REQUEST_ISSET_POST('id')) $uid = REQUEST_POST('id');
} else {
// Not logged in
$uid = 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 (!REQUEST_ISSET_GET('login')) REQUEST_SET_GET('login' , '');
if (IS_MEMBER()) {
// Login immidiately...
$URL = 'modules.php?module=login';
-} elseif ((IS_FORM_SENT()) && (''.$uid.'' != ''.REQUEST_POST('id').'')) {
+} elseif ((isFormSent()) && (''.$uid.'' != ''.REQUEST_POST('id') . '')) {
// Invalid input (no nickname extension installed but nickname entered)
$errorCode = getCode('EXTENSION_PROBLEM');
-} elseif (IS_FORM_SENT()) {
+} 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))) {
}
// Login problems?
-if (REQUEST_ISSET_GET(('login'))) {
+if (REQUEST_ISSET_GET('login')) {
// Use code from URL
- $errorCode = REQUEST_GET(('login'));
+ $errorCode = REQUEST_GET('login');
} // END - if
// Login problems?
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $errorCode));
$message .= getMessage('LOGIN_WRONG_ID');
break;
- }
- $message .= "</span>
+ }
+ $message .= "</span>
</td>
<td width=\"10\" class=\"seperator\"> </td>
</tr>\n";
- define('LOGIN_FAILURE_MSG', $message);
+ define('LOGIN_FAILURE_MSG', $message);
} else {
// No problems, no output
define('LOGIN_FAILURE_MSG', '');
// URL was constructed
if (getTotalFatalErrors()) {
// Fatal errors!
- LOAD_INC_ONCE('inc/fatal_errors.php');
+ loadIncludeOnce('inc/fatal_errors.php');
} else {
// Load URL
- LOAD_URL($URL);
+ redirectToUrl($URL);
}
} // END - if