Some more improvements:

- 'provider' renamed to 'registration_provider' (GET parameter)
- Added developer-only code (do only use if you are developing on the
  registration and don't want to have registrations, e.g. because you are
  implementing a new registration provider.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index 1eac55824e5311d6b74cfc43d8f6942e108d1193..6ae844248d9f0a9f850cf4d2eaafee8307cf4877 100644 (file)
--- a/inc/filter/register_filter.php
+++ b/inc/filter/register_filter.php
@@ -123,7 +123,7 @@ function FILTER_GENERIC_USER_REGISTRATION ($filterData) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'register')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
                // Run it
                $filterData['status'] = doGenericUserRegistration();
 
@@ -143,7 +143,7 @@ function FILTER_GENERIC_USER_REGISTRATION_CHECK () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is the registration provider set?
-       if ((isFormSent()) && (isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'register')) {
+       if ((isFormSent()) && (isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
                // Check form
                $isFormSent = isRegistrationDataComplete();
 
@@ -161,7 +161,7 @@ function FILTER_GENERIC_USER_REGISTRATION_DONE () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'register')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
                // Run it
                displayMessage('{--REGISTRATION_DONE--}');
 
@@ -178,7 +178,7 @@ function FILTER_GENERIC_USER_REGISTRATION_FAILED () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'register')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
                // This should not be reached
                reportBug(__FUNCTION__, __LINE__, 'This filter should not handle it.');
        } // END - if
@@ -192,7 +192,7 @@ function FILTER_GENERIC_USER_REGISTRATION_FORM () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if (((isGetRequestElementSet('provider')) && (getRequestElement('provider') == 'register')) || ((!isGetRequestElementSet('provider')) && (getDefaultRegistrationProvider() == 'register'))) {
+       if (((isGetRequestElementSet('registration_provider')) && (getRequestElement('registration_provider') == 'register')) || ((!isGetRequestElementSet('registration_provider')) && (getDefaultRegistrationProvider() == 'register'))) {
                // Display generic form
                doDisplayGenericUserRegistrationForm();
 

diff --git a/inc/filter/wernis_filter.php b/inc/filter/wernis_filter.php
index 0de661bac38fda585eadca9b0e9879a6f5ea0aef..902473adfba8ebb8672b1c9d415403bff5430cdf 100644 (file)
--- a/inc/filter/wernis_filter.php
+++ b/inc/filter/wernis_filter.php
@@ -45,7 +45,7 @@ function FILTER_WERNIS_USER_REGISTRATION ($filterData) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'wernis')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
                // Run it
                $filterData['status'] = doWernisUserRegistration();
 
@@ -64,7 +64,7 @@ function FILTER_WERNIS_USER_REGISTRATION_DONE () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'wernis')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
                // Run it
 
                // Interrupt filter chain
@@ -82,7 +82,7 @@ function FILTER_WERNIS_USER_REGISTRATION_FAILED () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is generic user registration selected?
-       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'wernis')) {
+       if ((isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
                // Run it
 
                // Interrupt filter chain
@@ -100,7 +100,7 @@ function FILTER_WERNIS_USER_REGISTRATION_FORM () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Is WDS66 user registration selected?
-       if (((isGetRequestElementSet('provider')) && (getRequestElement('provider') == 'wernis')) || ((!isGetRequestElementSet('provider')) && (getDefaultRegistrationProvider() == 'wernis'))) {
+       if (((isGetRequestElementSet('registration_provider')) && (getRequestElement('registration_provider') == 'wernis')) || ((!isGetRequestElementSet('registration_provider')) && (getDefaultRegistrationProvider() == 'wernis'))) {
                // Run it
                doDisplayWernisUserRegistrationForm();
 
@@ -114,31 +114,42 @@ function FILTER_WERNIS_USER_REGISTRATION_FORM () {
 }
 
 // Filter to run WDS66 API user registation check
-function FILTER_WERNIS_USER_REGISTRATION_CHECK ($filterData) {
+function FILTER_WERNIS_USER_REGISTRATION_CHECK () {
+       // Default is form is not sent
+       $isFormSent = FALSE;
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
+       // Is the registration provider set?
+       if ((isFormSent('wernis_register')) && (isPostRequestElementSet('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
+               // Check form
+               $isFormSent = isRegistrationDataComplete();
+
+               // Interrupt filter chain
+               interruptFilterChain();
+       } // END - if
+
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $filterData;
+       return $isFormSent;
 }
 
 // Filter for WDS66 API user login
 // @TODO 0% done
 function FILTER_WERNIS_USER_LOGIN ($filterData) {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Return filter data
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
        return $filterData;
 }
 
 // Filter for WDS66 API user login check
 // @TODO 0% done
 function FILTER_WERNIS_USER_LOGIN_CHECK ($filterData) {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
        // Return filter data
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
        return $filterData;
 }
 

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 0880221a1a256411cbc0b90fe9461517cabf695b..c6f458a565c3e8126a3432188ed8f3061c939085 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -328,6 +328,14 @@ function doGenericUserRegistration () {
                return FALSE;
        } // END - if
 
+       // These elements must be set
+       assert(isset($GLOBALS['register_country_row']));
+       assert(isset($GLOBALS['register_country_data']));
+       assert(isset($GLOBALS['register_confirm_hash']));
+
+       // Only comment this in if you develop
+       //* DEVELOPER-CODE: */ return TRUE;
+
        // Create user's account...
        sqlQueryEscaped("INSERT INTO
        `{?_MYSQL_PREFIX?}_user_data`

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index b17121d3652b530a4f5b43e4cd4aa9927fad4a48..7a3adca9ba04417b5094f557595e695e0f17e7be 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -529,13 +529,13 @@ function doDisplayWernisUserRegistrationForm () {
 
 // Finish user registration with WDS66 API
 function doWernisFinishUserRegistration ($challenge, $challengeResponse, $status) {
-       // Check status from GET parameters and stored value
+       // Check status from GET parameters and if the form has been sent
        if (($status == '1') && (isFormSent('wernis_register'))) {
-               // Form has been sent
-               die(__FUNCTION__ . ':' . __LINE__ . ': Reached!');
+               // The form has been sent and challenge is fine
+               die(__FUNCTION__ . ':' . __LINE__ . '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
        } elseif ($status == '1') {
                // Get mapped data based on challenge
-               $return = getWernisMapedDataFromApiByChallenge($challenge, $status);
+               $return = getWernisMappedDataFromApiByChallenge($challenge, $status);
 
                // Is the array filled?
                if ((count($return['mapped_data']) > 0) && (empty($return['message']))) {
@@ -565,7 +565,7 @@ function doWernisFinishUserRegistration ($challenge, $challengeResponse, $status
 }
 
 // "Getter" for mapped data by calling the API and given challenge and status
-function getWernisMapedDataFromApiByChallenge ($challenge, $status) {
+function getWernisMappedDataFromApiByChallenge ($challenge, $status) {
        // Get stored registration data
        $rows = getWernisRegistrationDataByKey('api_redirect_challenge', $challenge);
 
@@ -799,7 +799,7 @@ function doWernisAuthAccepted ($args) {
        // auth_key and wernis_userid must be set
        assert(isset($args['auth_key']));
        assert(isset($args['wernis_userid']));
-       die(__FUNCTION__ . '<pre>'.print_r($args, TRUE).'</pre>');
+       die(__FUNCTION__ . ':' . __LINE__ . '<pre>' . print_r($args, TRUE) . '</pre>');
 }
 
 //-----------------------------------------------------------------------------

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 6d158ca22623851341636bd9420a8024dbd6ec39..c1745541512c202d46eff0393d0b5fd504ff2a24 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -64,7 +64,7 @@ if (runFilterChain('check_user_registration') === TRUE) {
        }
 } else {
        // Is a registration provider selected?
-       if (!isGetRequestElementSet('provider')) {
+       if (!isGetRequestElementSet('registration_provider')) {
                // Display selector form
                loadTemplate('guest_registration_select');
        } // END - if

diff --git a/templates/de/html/guest/guest_registration_provider_row.tpl b/templates/de/html/guest/guest_registration_provider_row.tpl
index 53ae0cc1db83215b9bb0868546a7f44f43208575..560c0dffae9c86ee05185a60ca816a0793d68bd9 100644 (file)
--- a/templates/de/html/guest/guest_registration_provider_row.tpl
+++ b/templates/de/html/guest/guest_registration_provider_row.tpl
@@ -1 +1 @@
-<li><a href="{%url=modules.php?module=index&amp;what=register&amp;provider=$content[provider_extension]%}">{%pipe,translateRegistrationProviderName=$content[provider_name]%}</a></li>
+<li><a href="{%url=modules.php?module=index&amp;what=register&amp;registration_provider=$content[provider_extension]%}">{%pipe,translateRegistrationProviderName=$content[provider_name]%}</a></li>

diff --git a/templates/de/html/guest/guest_wernis_registration_form.tpl b/templates/de/html/guest/guest_wernis_registration_form.tpl
index 8fed6a763b90cab51d7ab85fb79a28f8de356683..2494f4e1ec996769b637d5b3a86b63c66369bd9d 100644 (file)
--- a/templates/de/html/guest/guest_wernis_registration_form.tpl
+++ b/templates/de/html/guest/guest_wernis_registration_form.tpl
@@ -1,6 +1,6 @@
 <div align="center">
-{%form,formMethodPost,formNameWernis_register=modules.php?module=index&amp;what=register&amp;provider=wernis&amp;status=1&amp;challenge=$content[challenge]&amp;__challenge_response=$content[__challenge_response]%}
-<input type="hidden" name="registration_provider" value="register" />
+{%form,formMethodPost,formNameWernis_register=modules.php?module=index&amp;what=register&amp;registration_provider=wernis&amp;status=1&amp;challenge=$content[challenge]&amp;__challenge_response=$content[__challenge_response]%}
+<input type="hidden" name="registration_provider" value="wernis" />
 <table border="0" cellspacing="0" cellpadding="0" width="640" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom">

diff --git a/templates/de/html/guest/guest_wernis_registration_rpc_form.tpl b/templates/de/html/guest/guest_wernis_registration_rpc_form.tpl
index 74d606aee25306616355f36a747a4312156440c9..04ed0877c123afd5bff6921c5211b2a19e01139c 100644 (file)
--- a/templates/de/html/guest/guest_wernis_registration_rpc_form.tpl
+++ b/templates/de/html/guest/guest_wernis_registration_rpc_form.tpl
@@ -1,6 +1,6 @@
 <div class="para">
 <div align="center">
-       {%form,formMethodPost=modules.php?module=index&amp;what=register&amp;provider=wernis%}
+       {%form,formMethodPost=modules.php?module=index&amp;what=register&amp;registration_provider=wernis%}
        <div class="table dashed">
                <div class="table_header bottom">
                        {--GUEST_WERNIS_REGISTRATION_TITLE--}