Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 5ea1ecd0ab06fee1c085484e588808b685035af7..1cf1ea0402282e3033609c540011a66ecf6992be 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -62,34 +62,34 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 } else {
        // Do this only if form is sent
        if (isFormSent()) {
-               if (postRequestParameter('agree') == '!') {
+               if (postRequestElement('agree') == '!') {
                        registerOutputFailedMessage('HAVE_TO_AGREE');
                } // END - if
 
-               if (postRequestParameter('email') == '!') {
+               if (postRequestElement('email') == '!') {
                        registerOutputFailedMessage('ENTER_EMAIL');
-                       setPostRequestParameter('email', '');
-               } elseif (postRequestParameter('email') == '?') {
+                       setPostRequestElement('email', '');
+               } elseif (postRequestElement('email') == '?') {
                        registerOutputFailedMessage('GUEST_EMAIL_IS_ALREADY_REGISTERED');
-                       setPostRequestParameter('email', '');
+                       setPostRequestElement('email', '');
                }
 
-               if (postRequestParameter('surname') == '!') {
+               if (postRequestElement('surname') == '!') {
                        registerOutputFailedMessage('ENTER_SURNAME');
-                       setPostRequestParameter('surname', '');
+                       setPostRequestElement('surname', '');
                } // END - if
 
-               if (postRequestParameter('family') == '!') {
+               if (postRequestElement('family') == '!') {
                        registerOutputFailedMessage('ENTER_FAMILY');
-                       setPostRequestParameter('family', '');
+                       setPostRequestElement('family', '');
                } // END - if
 
-               if ((postRequestParameter('pass1') == '!') && (postRequestParameter('pass2') == '!')) {
+               if ((postRequestElement('pass1') == '!') && (postRequestElement('pass2') == '!')) {
                        registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
-               } elseif (postRequestParameter('pass1') == '!') {
-                       registerOutputFailedMessage('ENTER_PASS1');
-               } elseif (postRequestParameter('pass2') == '!') {
-                       registerOutputFailedMessage('ENTER_PASS2');
+               } elseif (postRequestElement('pass1') == '!') {
+                       registerOutputFailedMessage('ENTER_PASSWORD1');
+               } elseif (postRequestElement('pass2') == '!') {
+                       registerOutputFailedMessage('ENTER_PASSWORD2');
                }
 
                if ((isset($GLOBALS['registration_short_password'])) && ($GLOBALS['registration_short_password'] === true)) {
@@ -108,17 +108,14 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        // Generate birthday selection
        switch (getLanguage()) {
                case 'de': // German date format
-                       $content['birthday_selection'] = addSelectionBox('day', postRequestParameter('day')).addSelectionBox('month', postRequestParameter('month')).addSelectionBox('year', postRequestParameter('year'));
+                       $content['birthday_selection'] = addSelectionBox('day', postRequestElement('day')).addSelectionBox('month', postRequestElement('month')).addSelectionBox('year', postRequestElement('year'));
                        break;
 
                default: // Default is the US date format... :)
-                       $content['birthday_selection'] = addSelectionBox('month', postRequestParameter('month')).addSelectionBox('day', postRequestParameter('day')).addSelectionBox('year', postRequestParameter('year'));
+                       $content['birthday_selection'] = addSelectionBox('month', postRequestElement('month')).addSelectionBox('day', postRequestElement('day')).addSelectionBox('year', postRequestElement('year'));
                        break;
        } // END - switch
 
-       // Adds a table for the guests with all visible categories
-       $content['category_selection'] = registerGenerateCategoryTable('guest', true);
-
        // Adds maximum receiveable mails list... :)
        $content['max_receive_list'] = addMaxReceiveList('guest', '', true);
 
@@ -136,13 +133,13 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 
        // ZIP codes are numerical values
        $content['zip'] = '';
-       if ((isPostRequestParameterSet('zip')) && (postRequestParameter('zip') > 0)) {
-               $content['zip'] = bigintval(postRequestParameter('zip'));
+       if ((isPostRequestElementSet('zip')) && (postRequestElement('zip') > 0)) {
+               $content['zip'] = bigintval(postRequestElement('zip'));
        } // END - if
 
        // Other values
        foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
-               $content[$entry] = SQL_ESCAPE(postRequestParameter($entry));
+               $content[$entry] = SQL_ESCAPE(postRequestElement($entry));
        } // END - foreach
 
        // The admin may see all
@@ -153,7 +150,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
 
        // Prepare country selection box
        $OUT  = '<select name="country_code" class="form_select" size="1">';
-       $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
+       $OUT .= generateOptionList('countries', 'id', 'descr', postRequestElement('country_code'), 'code', $whereStatement);
        $OUT .= '</select>';
        $content['country'] = $OUT;