Registration provider continued:

- Added missing guest templates, "translate" function, language elements
- Fixed handling of 'provider' parameter (renamed!) in filters
- Start of cleanup of CSS classes

diff --git a/.gitattributes b/.gitattributes
index 5b0136190c4e3cabb5db377d35869f3324dc0640..edd6d170adeeec94215ecb7d694aec1322e50e95 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1850,6 +1850,8 @@ templates/de/html/guest/guest_receive_table.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_registration_select.tpl svneol=native#text/plain
 templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain

diff --git a/inc/filter/register_filter.php b/inc/filter/register_filter.php
index b160adff37ffcf1795e8b26cf4094848ac78bcae..1eac55824e5311d6b74cfc43d8f6942e108d1193 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('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
+       if ((isFormSent()) && (isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (postRequestElement('registration_provider') == 'register')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (getRequestElement('registration_provider') == 'register')) || (getDefaultRegistrationProvider() == 'register')) {
+       if (((isGetRequestElementSet('provider')) && (getRequestElement('provider') == 'register')) || ((!isGetRequestElementSet('provider')) && (getDefaultRegistrationProvider() == 'register'))) {
                // Display generic form
                doDisplayGenericUserRegistrationForm();
 

diff --git a/inc/filter/wernis_filter.php b/inc/filter/wernis_filter.php
index 53b5a43b8c66aa5ebaf568ef84c5361fb05629db..5264ed0232e6cfa8c67d57e1100b30c0a814a4d2 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('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('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('registration_provider')) && (postRequestElement('registration_provider') == 'wernis')) {
+       if ((isPostRequestElementSet('provider')) && (postRequestElement('provider') == 'wernis')) {
                // Run it
 
                // Interrupt filter chain
@@ -99,8 +99,8 @@ 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('provider')) && (getRequestElement('provider') == 'wernis')) || ((!isGetRequestElementSet('provider')) && (getDefaultRegistrationProvider() == 'wernis'))) {
                // Run it
 
                // Interrupt filter chain

diff --git a/inc/language/register_de.php b/inc/language/register_de.php
index a46ef6fc7c07c4f394e96272a432d6f7c80afe12..fef5e3a823151d25c03c592c8e414f6d44d5c3fc 100644 (file)
--- a/inc/language/register_de.php
+++ b/inc/language/register_de.php
@@ -54,7 +54,8 @@ addMessages(array(
        'POINTS_SUBJECT_REFERRAL_BONUS' => "Einmalige Werbeprämie",
        'POINTS_SUBJECT_REFERRAL_BONUS_REF' => "Anteilige einml. Werbeprämie",
 
-       // Guest - others
+       // Guest - registration provider
+       'GUEST_REGISTRATION_PROVIDER_TITLE' => "Wählen Sie einen anderen Anmeldedienst aus:",
        'GUEST_SELECT_OTHER_REGISTRATION_FORM_TITLE' => "Mit anderen Diensten bei {?MAIN_TITLE?} anmelden.",
        'GUEST_SELECT_OTHER_REGISTRATION_FORM_NOTICE' => "Beim Anmelden mit einen anderen Dienst "verbinden" Sie diesen mit diesem {?mt_word?}. Dadurch werden Daten vom Anmeldedienst an diesen übertragen. Mehr dazu steht beim Anmeldeformular des jweiligen Anbieters.",
        'GUEST_EXTRA_REGISTRATION_PROVIDER_404' => "Es wurden noch keine weiteren Anmeldedienste freigegeben oder eingerichtet. Bitte verwenden Sie das nachfolgende Formular zur lokalen Anmeldung.",

diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php
index 956927e57affaedd505d110ab1d476c462594c65..72179cc472bf5a50b3f2220c10e50776a5ada3b2 100644 (file)
--- a/inc/language/wernis_de.php
+++ b/inc/language/wernis_de.php
@@ -139,6 +139,9 @@ addMessages(array(
 
        // Points accounts - subject
        'POINTS_SUBJECT_WERNIS_WITHDRAW' => "Einzahlung vom WDS66-Account",
+
+       // Registration provider
+       'REGISTRATION_PROVIDER_WERNIS_USER_REGISTRATION' => "Mit WDS66-Portal anmelden ...",
 ));
 
 // [EOF]

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 2fc717896b9417610150ebc8bcdff62e8db708fd..f0bd6cd97f9ed50b64e73e1f9d29628232e1858c 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -710,5 +710,14 @@ ORDER BY
        return $content;
 }
 
+// ----------------------------------------------------------------------------
+//                            "Translator" functions
+// ----------------------------------------------------------------------------
+
+function translateRegistrationProviderName ($providerName) {
+       // "Translate it"
+       return '{--REGISTRATION_PROVIDER_' . strtoupper($providerName) . '--}';
+}
+
 // [EOF]
 ?>

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index c1745541512c202d46eff0393d0b5fd504ff2a24..6d158ca22623851341636bd9420a8024dbd6ec39 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('registration_provider')) {
+       if (!isGetRequestElementSet('provider')) {
                // Display selector form
                loadTemplate('guest_registration_select');
        } // END - if

diff --git a/templates/de/html/guest/guest_registration_provider.tpl b/templates/de/html/guest/guest_registration_provider.tpl
new file mode 100644 (file)
index 0000000..a9a805c
--- /dev/null
+++ b/templates/de/html/guest/guest_registration_provider.tpl
@@ -0,0 +1,6 @@
+<div align="left">
+       {--GUEST_REGISTRATION_PROVIDER_TITLE--}
+       <ul>
+               $content
+       </ul>
+</div>

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

diff --git a/theme/business/css/general.css b/theme/business/css/general.css
index 43e46d2656b85c63aa773e771d946207792f47f3..68f6fc07058fb00989c2817f9d972a191130b806 100644 (file)
--- a/theme/business/css/general.css
+++ b/theme/business/css/general.css
@@ -294,7 +294,6 @@ a.logout_box {
        border: 1px solid #000000;
        border-top: 0px;
        background-color: #ffffff;
-       height: 22px;
        text-align: left;
 }
 

diff --git a/theme/default/css/general.css b/theme/default/css/general.css
index 900066091919421480a9dc47bd5ba7924b48b6c6..98a5afc7233b64b34c4f914f9195a0d98845a5c7 100644 (file)
--- a/theme/default/css/general.css
+++ b/theme/default/css/general.css
@@ -305,7 +305,6 @@ a.logout_box {
        border: 1px solid #00aa44;
        border-top: 0px;
        background-color: #eeffbc;
-       height: 22px;
        text-align: left;
 }
 

diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css
index 0ccd44a8c4fbf53aa176f1eed88edba7b874733b..fad9d62e38a4f8516e5c169cd5d62228c288f187 100644 (file)
--- a/theme/desert/css/general.css
+++ b/theme/desert/css/general.css
@@ -265,7 +265,6 @@ a.logout_box {
        border: 1px solid #880000;
        border-top: 0px;
        background-color: #ffffcc;
-       height: 22px;
        text-align: left;
 }
 

diff --git a/theme/ship-simu/css/general.css b/theme/ship-simu/css/general.css
index 3d43c847e18ee7f94c57cb56f62fbcb9d12aad28..81b778ff7e54b4ab41ab08ec437b1624accc6d24 100644 (file)
--- a/theme/ship-simu/css/general.css
+++ b/theme/ship-simu/css/general.css
@@ -247,7 +247,6 @@ label {
        border                  : 1px solid #000000;
        border-top              : 0px;
        background-color        : #FFFFFF;
-       height                  : 22px;
 }
 
 .guest_menu_separator, .member_menu_separator {