Registration provider continued:
authorRoland Häder <roland@mxchange.org>
Sun, 4 Aug 2013 05:38:00 +0000 (05:38 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 4 Aug 2013 05:38:00 +0000 (05:38 +0000)
- Added missing guest templates, "translate" function, language elements
- Fixed handling of 'provider' parameter (renamed!) in filters
- Start of cleanup of CSS classes

13 files changed:
.gitattributes
inc/filter/register_filter.php
inc/filter/wernis_filter.php
inc/language/register_de.php
inc/language/wernis_de.php
inc/libs/register_functions.php
inc/modules/guest/what-register.php
templates/de/html/guest/guest_registration_provider.tpl [new file with mode: 0644]
templates/de/html/guest/guest_registration_provider_row.tpl [new file with mode: 0644]
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css
theme/ship-simu/css/general.css

index 5b01361..edd6d17 100644 (file)
@@ -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
index b160adf..1eac558 100644 (file)
@@ -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();
 
index 53b5a43..5264ed0 100644 (file)
@@ -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
index a46ef6f..fef5e3a 100644 (file)
@@ -54,7 +54,8 @@ addMessages(array(
        'POINTS_SUBJECT_REFERRAL_BONUS' => "Einmalige Werbepr&auml;mie",
        'POINTS_SUBJECT_REFERRAL_BONUS_REF' => "Anteilige einml. Werbepr&auml;mie",
 
-       // Guest - others
+       // Guest - registration provider
+       'GUEST_REGISTRATION_PROVIDER_TITLE' => "W&auml;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 &quot;verbinden&quot; Sie diesen mit diesem {?mt_word?}. Dadurch werden Daten vom Anmeldedienst an diesen &uuml;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.",
index 956927e..72179cc 100644 (file)
@@ -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]
index 2fc7178..f0bd6cd 100644 (file)
@@ -710,5 +710,14 @@ ORDER BY
        return $content;
 }
 
+// ----------------------------------------------------------------------------
+//                            "Translator" functions
+// ----------------------------------------------------------------------------
+
+function translateRegistrationProviderName ($providerName) {
+       // "Translate it"
+       return '{--REGISTRATION_PROVIDER_' . strtoupper($providerName) . '--}';
+}
+
 // [EOF]
 ?>
index c174554..6d158ca 100644 (file)
@@ -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
@@ -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
@@ -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>
index 43e46d2..68f6fc0 100644 (file)
@@ -294,7 +294,6 @@ a.logout_box {
        border: 1px solid #000000;
        border-top: 0px;
        background-color: #ffffff;
-       height: 22px;
        text-align: left;
 }
 
index 9000660..98a5afc 100644 (file)
@@ -305,7 +305,6 @@ a.logout_box {
        border: 1px solid #00aa44;
        border-top: 0px;
        background-color: #eeffbc;
-       height: 22px;
        text-align: left;
 }
 
index 0ccd44a..fad9d62 100644 (file)
@@ -265,7 +265,6 @@ a.logout_box {
        border: 1px solid #880000;
        border-top: 0px;
        background-color: #ffffcc;
-       height: 22px;
        text-align: left;
 }
 
index 3d43c84..81b778f 100644 (file)
@@ -247,7 +247,6 @@ label {
        border                  : 1px solid #000000;
        border-top              : 0px;
        background-color        : #FFFFFF;
-       height                  : 22px;
 }
 
 .guest_menu_separator, .member_menu_separator {