More misc fixes and rewrites (sorry, lame description)

[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 f48373d62f062d148c5d60365ded7a6bb2a5f79c..56085111a2a3fd4bf7a5a0c912fb73d014a5e131 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -62,16 +62,16 @@ $add = '';
 if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $uid = getUserId();
-} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (isFormSent())) {
+} 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')))) {
+       if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE(REQUEST_POST('id')))) {
                // Nickname entered
                $uid = SQL_ESCAPE(REQUEST_POST('id'));
        } else {
                // Direct userid entered
                $uid  = bigintval(REQUEST_POST('id'));
        }
-} elseif (REQUEST_ISSET_POST(('new_pass'))) {
+} elseif (REQUEST_ISSET_POST('new_pass')) {
        // New password requested
        $uid = 0;
        if (REQUEST_ISSET_POST('id')) $uid = REQUEST_POST('id');
@@ -81,7 +81,7 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 }
 
 // Set unset variables
-if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', '');
+if (!REQUEST_ISSET_POST('new_pass')) REQUEST_SET_POST('new_pass', '');
 if (!REQUEST_ISSET_GET('login'))     REQUEST_SET_GET('login'    , '');
 
 if (IS_MEMBER()) {
@@ -93,7 +93,7 @@ if (IS_MEMBER()) {
 } 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))) {
+} elseif ((REQUEST_ISSET_POST('new_pass')) && (isset($uid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
        $errorCode = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
 }