From 6ef6799565051ceac37a56b80c3f2a87b01e3ca2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 4 Aug 2013 05:38:00 +0000 Subject: [PATCH] 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 --- .gitattributes | 2 ++ inc/filter/register_filter.php | 10 +++++----- inc/filter/wernis_filter.php | 10 +++++----- inc/language/register_de.php | 3 ++- inc/language/wernis_de.php | 3 +++ inc/libs/register_functions.php | 9 +++++++++ inc/modules/guest/what-register.php | 2 +- .../de/html/guest/guest_registration_provider.tpl | 6 ++++++ .../de/html/guest/guest_registration_provider_row.tpl | 1 + theme/business/css/general.css | 1 - theme/default/css/general.css | 1 - theme/desert/css/general.css | 1 - theme/ship-simu/css/general.css | 1 - 13 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 templates/de/html/guest/guest_registration_provider.tpl create mode 100644 templates/de/html/guest/guest_registration_provider_row.tpl diff --git a/.gitattributes b/.gitattributes index 5b0136190c..edd6d170ad 100644 --- 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 b160adff37..1eac55824e 100644 --- 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 53b5a43b8c..5264ed0232 100644 --- 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 a46ef6fc7c..fef5e3a823 100644 --- 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 956927e57a..72179cc472 100644 --- 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 2fc717896b..f0bd6cd97f 100644 --- 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 c174554151..6d158ca226 100644 --- 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 index 0000000000..a9a805ccba --- /dev/null +++ b/templates/de/html/guest/guest_registration_provider.tpl @@ -0,0 +1,6 @@ +
+ {--GUEST_REGISTRATION_PROVIDER_TITLE--} + +
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 index 0000000000..53ae0cc1db --- /dev/null +++ b/templates/de/html/guest/guest_registration_provider_row.tpl @@ -0,0 +1 @@ +
  • {%pipe,translateRegistrationProviderName=$content[provider_name]%}
    • diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 43e46d2656..68f6fc0705 100644 --- 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 9000660919..98a5afc723 100644 --- 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 0ccd44a8c4..fad9d62e38 100644 --- 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 3d43c847e1..81b778ff7e 100644 --- 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 { -- 2.39.2