Fixes for stripped HTML tags, and false warnings in debug log

[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 23d2f9df8b82fdebf3fd022d2562e034b499fe2e..25e28faeefe505b97307b5a736ca3eafb9a91903 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())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "user");
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
        return;
 }
 
@@ -58,46 +58,46 @@ $ADD = "";
 if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $uid = $GLOBALS['userid'];
-} elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok']))) {
+} elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
        // Set userid and crypt password when login data was submitted
-       if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($_POST['id']))) {
+       if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
                // Nickname entered
-               $uid = SQL_ESCAPE($_POST['id']);
+               $uid = SQL_ESCAPE(REQUEST_POST('id'));
        } else {
                // Direct userid entered
-               $uid  = bigintval($_POST['id']);
+               $uid  = bigintval(REQUEST_POST('id'));
        }
-} elseif (!empty($_POST['new_pass'])) {
+} elseif (REQUEST_ISSET_POST(('new_pass'))) {
        // New password requested
        $uid = 0;
-       if (!empty($_POST['id'])) $uid = $_POST['id'];
+       if (REQUEST_ISSET_POST(('id'))) $uid = REQUEST_POST('id');
 } else {
        // Not logged in
        $uid = 0; $hash = "";
 }
 
 // Set unset variables
-if (empty($_POST['new_pass'])) $_POST['new_pass'] = "";
-if (empty($_GET['login']))     $_GET['login']     = "";
+if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', "");
+if (!REQUEST_ISSET_GET(('login')))     REQUEST_SET_GET('login'    , "");
 
 if (IS_MEMBER()) {
        // Login immidiately...
        $URL = "modules.php?module=login";
-} elseif ((isset($_POST['ok'])) && ("".$uid."" != "".$_POST['id']."")) {
+} elseif ((IS_FORM_SENT()) && ("".$uid."" != "".REQUEST_POST('id')."")) {
        // Invalid input (no nickname extension installed but nickname entered)
-       $ERROR = CODE_EXTENSION_PROBLEM;
-} elseif (isset($_POST['ok'])) {
+       $ERROR = constant('CODE_EXTENSION_PROBLEM');
+} elseif (IS_FORM_SENT()) {
        // Try the login (see inc/libs/user_functions.php)
-       $URL = USER_DO_LOGIN($_POST['id'], $_POST['password']);
-} elseif ((!empty($_POST['new_pass'])) && (isset($uid))) {
+       $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
+} elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
-       $ERROR = USER_DO_NEW_PASSWORD($_POST['email'], $uid);
+       $ERROR = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
 }
 
 // Login problems?
-if (!empty($_GET['login'])) {
+if (REQUEST_ISSET_GET(('login'))) {
        // Use code from URL
-       $ERROR = SQL_ESCAPE($_GET['login']);
+       $ERROR = REQUEST_GET(('login'));
 } // END  - if
 
 // Login problems?
@@ -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,9 +162,9 @@ if (EXT_IS_ACTIVE("nickname")) {
 // Was an URL constructed?
 if (!empty($URL)) {
        // URL was constructed
-       if (getTotalFatalErrorMessages()) {
+       if (getTotalFatalErrors()) {
                // Fatal errors!
-               require_once(PATH."inc/fatal_errors.php");
+               LOAD_INC_ONCE("inc/fatal_errors.php");
        } else {
                // Load URL
                LOAD_URL($URL);