More variables renamed to , install/admin_WriteData() is now generic (with open TODO)

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 6b108994f6918487ef27986af1ab8e2de9ecd362..cd575419ea0ab085828403e2a57c63c62113c89d 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "user");
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
        return;
 }
 
@@ -85,7 +85,7 @@ if (IS_MEMBER()) {
        $URL = "modules.php?module=login";
 } elseif ((isset($_POST['ok'])) && ("".$uid."" != "".$_POST['id']."")) {
        // Invalid input (no nickname extension installed but nickname entered)
-       $ERROR = CODE_EXTENSION_PROBLEM;
+       $ERROR = constant('CODE_EXTENSION_PROBLEM');
 } elseif (isset($_POST['ok'])) {
        // Try the login (see inc/libs/user_functions.php)
        $URL = USER_DO_LOGIN($_POST['id'], $_POST['password']);
@@ -109,37 +109,37 @@ if (!empty($ERROR)) {
     <span class=\"guest_failed\">";
 
        switch ($ERROR) {
-               case CODE_WRONG_PASS:
-                       $MSG .= LOGIN_WRONG_PASS;
+               case constant('CODE_WRONG_PASS'):
+                       $MSG .= getMessage('LOGIN_WRONG_PASS');
                        break;
 
-               case CODE_WRONG_ID:
-                       $MSG .= LOGIN_WRONG_ID;
+               case constant('CODE_WRONG_ID'):
+                       $MSG .= getMessage('LOGIN_WRONG_ID');
                        break;
 
-               case CODE_ID_LOCKED:
-                       $MSG .= LOGIN_ID_LOCKED;
+               case constant('CODE_ID_LOCKED'):
+                       $MSG .= getMessage('LOGIN_ID_LOCKED');
                        break;
 
-               case CODE_ID_UNCONFIRMED:
-                       $MSG .= LOGIN_ID_UNCONFIRMED;
+               case constant('CODE_ID_UNCONFIRMED'):
+                       $MSG .= getMessage('LOGIN_ID_UNCONFIRMED');
                        break;
 
-               case CODE_NO_COOKIES:
-                       $MSG .= LOGIN_NO_COOKIES;
+               case constant('CODE_NO_COOKIES'):
+                       $MSG .= getMessage('LOGIN_NO_COOKIES');
                        break;
 
-               case CODE_EXTENSION_PROBLEM:
+               case constant('CODE_EXTENSION_PROBLEM'):
                        if (IS_ADMIN()) {
-                               $MSG .= sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "nickname");
+                               $MSG .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
                        } else {
-                               $MSG .= LOGIN_WRONG_ID;
+                               $MSG .= getMessage('LOGIN_WRONG_ID');
                        }
                        break;
 
                default:
                        DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $ERROR));
-                       $MSG .= LOGIN_WRONG_ID;
+                       $MSG .= getMessage('LOGIN_WRONG_ID');
                        break;
                }
                $MSG .= "</span>
@@ -162,10 +162,9 @@ if (EXT_IS_ACTIVE("nickname")) {
 // Was an URL constructed?
 if (!empty($URL)) {
        // URL was constructed
-       global $FATAL;
-       if (!empty($FATAL[0])) {
+       if (getTotalFatalErrors()) {
                // Fatal errors!
-               require_once(PATH."inc/fatal_errors.php");
+               LOAD_INC_ONCE("inc/fatal_errors.php");
        } else {
                // Load URL
                LOAD_URL($URL);