X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=4db7500c07cd27b989107f3137b7f0305b613297;hb=4cec044b57773e28423261c71f918f3e22ca8a75;hp=5cb1ee209a4e8d0144dea3d64ff170e1453c4a18;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git
diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 5cb1ee209a..4db7500c07 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -1,7 +1,7 @@
|
";
- switch ($errorCode) {
- case getCode('WRONG_PASS'):
- $message .= getMessage('LOGIN_WRONG_PASS');
- break;
-
- case getCode('WRONG_ID'):
- $message .= getMessage('LOGIN_WRONG_ID');
- break;
-
- case getCode('ID_LOCKED'):
- $message .= getMessage('LOGIN_ID_LOCKED');
- break;
+ // Convert the code to message
+ $message .= getMessageFromErrorCode($errorCode);
- case getCode('ID_UNCONFIRMED'):
- $message .= getMessage('LOGIN_ID_UNCONFIRMED');
- break;
-
- case getCode('NO_COOKIES'):
- $message .= getMessage('LOGIN_NO_COOKIES');
- break;
-
- case getCode('EXTENSION_PROBLEM'):
- if (IS_ADMIN()) {
- $message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'nickname');
- } else {
- $message .= getMessage('LOGIN_WRONG_ID');
- }
- break;
-
- default:
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $errorCode));
- $message .= getMessage('LOGIN_WRONG_ID');
- break;
- }
- $message .= "
+ // Continue with HTML
+ $message .= "
|
|
\n";
- define('LOGIN_FAILURE_MSG', $message);
-} else {
- // No problems, no output
- define('LOGIN_FAILURE_MSG', '');
-}
+ $content['message'] = $message;
+} // END - if
// Display login form with resend-password form
-if (EXT_IS_ACTIVE('nickname')) {
- LOAD_TEMPLATE("guest_nickname_login");
+if (isExtensionActive('nickname')) {
+ loadTemplate('guest_nickname_login', false, $content);
} else {
- LOAD_TEMPLATE("guest_login");
+ loadTemplate('guest_login', false, $content);
}
// Was an URL constructed?
if (!empty($URL)) {
// URL was constructed
- if (getTotalFatalErrors()) {
- // Fatal errors!
- LOAD_INC_ONCE("inc/fatal_errors.php");
+ if (getTotalFatalErrors() > 0) {
+ // Handle fatal errors
+ runFilterChain('handle_fatal_errors');
} else {
// Load URL
- LOAD_URL($URL);
+ redirectToUrl($URL);
}
} // END - if
-//
+// [EOF]
?>