Added new pre-registration filter for WDS66-based registration (unfinished).

[mailer.git] / inc / filter / wernis_filter.php

diff --git a/inc/filter/wernis_filter.php b/inc/filter/wernis_filter.php
index 53b5a43b8c66aa5ebaf568ef84c5361fb05629db..2bedc8c7b02285ef6bf2d25a8410ad457ad661fb 100644 (file)
--- a/inc/filter/wernis_filter.php
+++ b/inc/filter/wernis_filter.php
@@ -99,9 +99,10 @@ function FILTER_WERNIS_USER_REGISTRATION_FAILED () {
 function FILTER_WERNIS_USER_REGISTRATION_FORM () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
-       // Is generic user registration selected?
-       if (((isGetRequestElementSet('registration_provider')) && (gettRequestElement('registration_provider') == 'wernis')) || (getDefaultRegistrationProvider() == 'wernis')) {
+       // Is WDS66 user registration selected?
+       if (((isGetRequestElementSet('registration_provider')) && (getRequestElement('registration_provider') == 'wernis')) || ((!isGetRequestElementSet('registration_provider')) && (getDefaultRegistrationProvider() == 'wernis'))) {
                // Run it
+               doDisplayWernisUserRegistrationForm();
 
                // Interrupt filter chain
                interruptFilterChain();
@@ -113,31 +114,57 @@ 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!');
+       return $filterData;
+}
+
+/**
+ * Run a filter for pre user registration
+ *
+ * @param      $filterData             Filter data from previous filter
+ * @return     $filterData             Unchanged filter data
+ */
+function FILTER_PRE_USER_REGISTRATION_WERNIS ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
+       // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       /* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';
        return $filterData;
 }