Continued with registration provider:

[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 d30a787e3f3677b3d313be08f6e4fb7c94b66e53..c1745541512c202d46eff0393d0b5fd504ff2a24 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -53,94 +53,24 @@ if (!isExtensionActive('register')) {
 
 // Is the form sent and all went fine?
 //* DEBUG: */ debugOutput('isFormSent=' . intval(isFormSent()) . ',isRegistrationDataComplete=' . intval(isRegistrationDataComplete()) . ',isAdmin=' . intval(isAdmin()));
-if ((isFormSent()) && (isRegistrationDataComplete())) {
+if (runFilterChain('check_user_registration') === TRUE) {
        // Do the registration here
-       doUserRegistration();
-
-       // Output success registration
-       displayMessage('{--REGISTRATION_DONE--}');
-} else {
-       // Do this only if form is sent
-       if (isFormSent()) {
-               if (postRequestElement('agree') == '!') {
-                       registerOutputFailedMessage('HAVE_TO_AGREE');
-               } // END - if
-
-               if (postRequestElement('email') == '!') {
-                       registerOutputFailedMessage('ENTER_EMAIL');
-                       setPostRequestElement('email', '');
-               } elseif (postRequestElement('email') == '?') {
-                       registerOutputFailedMessage('GUEST_EMAIL_IS_ALREADY_REGISTERED');
-                       setPostRequestElement('email', '');
-               }
-
-               if (postRequestElement('surname') == '!') {
-                       registerOutputFailedMessage('ENTER_SURNAME');
-                       setPostRequestElement('surname', '');
-               } // END - if
-
-               if (postRequestElement('family') == '!') {
-                       registerOutputFailedMessage('ENTER_FAMILY');
-                       setPostRequestElement('family', '');
-               } // END - if
-
-               if ((postRequestElement('password1') == '!') && (postRequestElement('password2') == '!')) {
-                       registerOutputFailedMessage('ENTER_BOTH_PASSWORDS');
-               } elseif (postRequestElement('password1') == '!') {
-                       registerOutputFailedMessage('ENTER_PASSWORD1');
-               } elseif (postRequestElement('password2') == '!') {
-                       registerOutputFailedMessage('ENTER_PASSWORD2');
-               }
-
-               if ((isset($GLOBALS['registration_weak_password'])) && ($GLOBALS['registration_weak_password'] === TRUE)) {
-                       registerOutputFailedMessage('GUEST_WEAK_PASSWORD');
-               } // END - if
-
-               if ((isset($GLOBALS['registration_ip_timeout'])) && ($GLOBALS['registration_ip_timeout'] === TRUE)) {
-                       registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
-               } // END - if
-
-               if ((!empty($GLOBALS['registration_selected_cats'])) && ($GLOBALS['registration_selected_cats'] < getLeastCats())) {
-                       registerOutputFailedMessage('', '{--CHOOSE_MORE_CATEGORIES--}');
-               } // END - if
-       } // END - if
-
-       // Generate birthday selection
-       switch (getLanguage()) {
-               case 'de': // German date format
-                       $content['birthday_selection'] = addSelectionBox('da', postRequestElement('day')).addSelectionBox('mo', postRequestElement('month')).addSelectionBox('ye', postRequestElement('year'));
-                       break;
-
-               default: // Default is the US date format... :)
-                       $content['birthday_selection'] = addSelectionBox('mo', postRequestElement('month')).addSelectionBox('da', postRequestElement('day')).addSelectionBox('ye', postRequestElement('year'));
-                       break;
-       } // END - switch
-
-       // Shall I display the refid or shall I make it editable?
-       if (isDisplayRefidEnabled()) {
-               // Load "hide" form template
-               $content['refid_content'] = loadTemplate('guest_register_refid_hide', TRUE);
+       if (doUserRegistration()) {
+               // All done
+               runFilterChain('user_registration_done');
        } else {
-               // Load template to enter it
-               $content['refid_content'] = loadTemplate('guest_register_refid', TRUE);
+               // Something failed
+               runFilterChain('user_registration_failed');
        }
-
-       // ZIP codes are numerical values
-       $content['zip'] = '';
-       if ((isPostRequestElementSet('zip')) && (isValidNumber(postRequestElement('zip')))) {
-               $content['zip'] = bigintval(postRequestElement('zip'));
+} else {
+       // Is a registration provider selected?
+       if (!isGetRequestElementSet('registration_provider')) {
+               // Display selector form
+               loadTemplate('guest_registration_select');
        } // END - if
 
-       // Other values
-       foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) {
-               $content[$entry] = sqlEscapeString(postRequestElement($entry));
-       } // END - foreach
-
-       // Set must-fillout fields
-       $content = runFilterChain('register_must_fillout', $content);
-
        // Display registration form
-       loadTemplate('guest_register', FALSE, $content);
+       runFilterChain('user_registration_form');
 }
 
 // [EOF]