Extension ext-earning introduced (unfinished), renamings:

[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 1129585e3b7220fd07f6c9d8422795ab535f4784..a55b7b4909bd81cd5f0b06f7f5f73f090c932225 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -60,29 +60,29 @@ $add = '';
 if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $userid = getMemberId();
-} elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
+} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if (isNicknameUsed(postRequestParameter('id'))) {
+       if (isNicknameUsed(postRequestElement('id'))) {
                // Nickname entered
-               $userid = SQL_ESCAPE(postRequestParameter('id'));
+               $userid = SQL_ESCAPE(postRequestElement('id'));
        } else {
                // Direct userid entered
-               $userid  = bigintval(postRequestParameter('id'));
+               $userid  = bigintval(postRequestElement('id'));
        }
-} elseif (isPostRequestParameterSet('new_pass')) {
+} elseif (isPostRequestElementSet('new_pass')) {
        // New password requested
        $userid = NULL;
-       if (isPostRequestParameterSet('email')) {
+       if (isPostRequestElementSet('email')) {
                // Email is set
-               $userid = SQL_ESCAPE(postRequestParameter('email'));
-       } elseif (isPostRequestParameterSet('id')) {
+               $userid = SQL_ESCAPE(postRequestElement('email'));
+       } elseif (isPostRequestElementSet('id')) {
                // Do we have nickname or userid?
-               if (isNicknameUsed(postRequestParameter('id'))) {
+               if (isNicknameUsed(postRequestElement('id'))) {
                        // Nickname entered
-                       $userid = SQL_ESCAPE(postRequestParameter('id'));
+                       $userid = SQL_ESCAPE(postRequestElement('id'));
                } else {
                        // Direct userid entered
-                       $userid  = bigintval(postRequestParameter('id'));
+                       $userid  = bigintval(postRequestElement('id'));
                }
        } // END - if
 } else {
@@ -94,21 +94,21 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 if (isMember()) {
        // Login immidiately...
        $url = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('id') . '')) {
+} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('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(postRequestParameter('id'), postRequestParameter('password'));
-} elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
+       $url = doUserLogin(postRequestElement('id'), postRequestElement('password'));
+} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
-       $errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
+       $errorCode = doNewUserPassword(postRequestElement('email'), $userid);
 }
 
 // Login problems?
-if (isGetRequestParameterSet('login')) {
+if (isGetRequestElementSet('login')) {
        // Use code from URL
-       $errorCode = getRequestParameter('login');
+       $errorCode = getRequestElement('login');
 } // END  - if
 
 // No problems, no output by detault