fooRequestElementBar() functions renamed, adding of request parameters added:

[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 0799b79fa3ee1a732d5f318d969d75aee2194561..bb5750c03eb82d6291414e354715a7ba548934fb 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -61,19 +61,19 @@ $add = '';
 if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $userid = getMemberId();
-} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
+} elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestElement('id')))) {
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
                // Nickname entered
-               $userid = SQL_ESCAPE(postRequestElement('id'));
+               $userid = SQL_ESCAPE(postRequestParameter('id'));
        } else {
                // Direct userid entered
-               $userid  = bigintval(postRequestElement('id'));
+               $userid  = bigintval(postRequestParameter('id'));
        }
-} elseif (isPostRequestElementSet('new_pass')) {
+} elseif (isPostRequestParameterSet('new_pass')) {
        // New password requested
        $userid = '0';
-       if ((isPostRequestElementSet('id')) && (postRequestElement('id') > 0)) $userid = bigintval(postRequestElement('id'));
+       if ((isPostRequestParameterSet('id')) && (postRequestParameter('id') > 0)) $userid = bigintval(postRequestParameter('id'));
 } else {
        // Not logged in
        $userid = '0'; $hash = '';
@@ -82,21 +82,21 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 if (isMember()) {
        // Login immidiately...
        $URL = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
+} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('id') . '')) {
        // Invalid input (no nickname extension installed but nickname entered)
        $errorCode = getCode('EXTENSION_PROBLEM');
 } elseif (isFormSent()) {
        // Try the login (see inc/libs/user_functions.php)
-       $URL = doUserLogin(postRequestElement('id'), postRequestElement('password'));
-} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) {
+       $URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
+} elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
-       $errorCode = doNewUserPassword(postRequestElement('email'), $userid);
+       $errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
 }
 
 // Login problems?
-if (isGetRequestElementSet('login')) {
+if (isGetRequestParameterSet('login')) {
        // Use code from URL
-       $errorCode = getRequestElement('login');
+       $errorCode = getRequestParameter('login');
 } // END  - if
 
 // No problems, no output by detault