From 5b90ab389309595fde01542842169d6cbd2fc562 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 31 Jul 2013 10:54:22 +0000 Subject: [PATCH] Rewrote some code, added templates/functions: - Introduced return(Error)Message() functions - Added template for choosing registration provider - Added template helper which reads all activated registration provider - Other improvements --- .gitattributes | 1 + inc/extensions-functions.php | 2 +- inc/install-functions.php | 2 +- inc/language/register_de.php | 7 ++- inc/language/sponsor_de.php | 4 +- inc/libs/network_functions.php | 6 +-- inc/libs/register_functions.php | 49 +++++++++++++++++++ inc/modules/admin/overview-inc.php | 2 +- inc/modules/admin/what-list_beg.php | 4 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_sponsor_pay.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 2 +- inc/modules/guest/what-sponsor_reg.php | 2 +- inc/modules/member/what-mydata.php | 2 +- inc/modules/member/what-reflinks.php | 2 +- inc/modules/member/what-stats.php | 4 +- inc/modules/member/what-transfer.php | 4 +- inc/modules/sponsor/account.php | 8 +-- inc/modules/sponsor/settings.php | 8 +-- inc/template-functions.php | 22 +++++++-- .../admin/admin_sponsor_change_data.tpl | 2 +- .../admin/admin_sponsor_change_email.tpl | 2 +- .../de/emails/admin/admin_sponsor_edit.tpl | 2 +- .../de/emails/sponsor/sponsor_change_data.tpl | 2 +- templates/de/html/admin/admin_add_sponsor.tpl | 2 +- .../de/html/admin/admin_edit_sponsor_edit.tpl | 2 +- .../html/admin/admin_list_sponsor_details.tpl | 2 +- .../html/guest/guest_registration_select.tpl | 16 ++++++ templates/de/html/guest/guest_sponsor_reg.tpl | 2 +- .../de/html/sponsor/sponsor_account_form.tpl | 2 +- 30 files changed, 126 insertions(+), 43 deletions(-) create mode 100644 templates/de/html/guest/guest_registration_select.tpl diff --git a/.gitattributes b/.gitattributes index 80a004b10a..5b0136190c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1850,6 +1850,7 @@ 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_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 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 88676dd81c..ea9e4673cb 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -873,7 +873,7 @@ function addExtensionVerboseSqlTable ($title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVA $OUT = loadTemplate('admin_extension_sql_table', TRUE, $content); } else { // No addional SQL commands to run - $OUT = displayMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}', TRUE); + $OUT = returnMessage('{--ADMIN_EXTENSION_VERBOSE_SQLS_404--}'); } } // END - if diff --git a/inc/install-functions.php b/inc/install-functions.php index 5942280ffa..4222ee2e95 100644 --- a/inc/install-functions.php +++ b/inc/install-functions.php @@ -151,7 +151,7 @@ function getInstallerContent () { $content = $GLOBALS['install_content']; } else { // Nothing found, this needs fixing - $content = displayMessage('{--INSTALLER_CONTENT_404--}', TRUE); + $content = returnMessage('{--INSTALLER_CONTENT_404--}'); } // Return content diff --git a/inc/language/register_de.php b/inc/language/register_de.php index 2296f38453..a46ef6fc7c 100644 --- a/inc/language/register_de.php +++ b/inc/language/register_de.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addMessages(array( 'GUEST_REGISTER_MUST_SET_NOTICE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.", 'PRE_USER_REGISTRATION_FAILED' => "Anmeldung fehlgeschlagen: Pre-Filterkette nicht gelaufen! Bitte melden Sie dies beim zuständigen Webmaster.", - 'CNTRY' => "Ländercode", + 'COUNTRY_CODE' => "Ländercode", 'GUEST_EMAIL_IS_ALREADY_REGISTERED' => "Sie haben sich bereits mit dieser Email-Adresse angemeldet, oder jemand anderes verwendet Ihre. Doppelte Anmeldungen sind bei uns verboten.", 'GUEST_ENTER_PASSWORDS' => "Passwort und -wiederholung eingeben:", @@ -54,6 +54,11 @@ addMessages(array( 'POINTS_SUBJECT_REFERRAL_BONUS' => "Einmalige Werbeprämie", 'POINTS_SUBJECT_REFERRAL_BONUS_REF' => "Anteilige einml. Werbeprämie", + // Guest - others + '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.", + // Admin - others 'ADMIN_SAVE_REGISTER_MUST' => "Einstellungen ändern", 'ADMIN_REGISTER_CHANGES_SAVED' => "Es wurden %s Pflichtfelder aktualisiert.", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 12d7a50cad..cea7750416 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -55,7 +55,7 @@ addMessages(array( 'ADMIN_SPONSOR_ENTER_CONTACT_DATA' => "Kontaktdaten des Sponsors", 'SPONSOR_ENTER_STREET_NR1' => "Straße mit Hausnummer", 'SPONSOR_ENTER_STREET_NR2' => "(noch Straße; Zeile 2)", - 'SPONSOR_ENTER_CNTRY_ZIP_CITY' => "Ländercode, PLZ, Wohnort", + 'SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY' => "Ländercode, PLZ, Wohnort", 'SPONSOR_ENTER_PHONE' => "Telefonnummer", 'SPONSOR_ENTER_FAX' => "Faxnummer", 'SPONSOR_ENTER_CELL' => "Handynummer", @@ -174,7 +174,7 @@ addMessages(array( 'SPONSOR_ACCOUNT_UNLOCKED' => "Ihr Sponsorenaccount wurde hiermit von einem unserer Administratoren wieder freigegeben. Sie können sich mit den alten Logindaten wieder einloggen. Sollten Sie Ihr Passwort vergessen haben, können Sie sich unter Sponsoren->Einloggen ein neues zusenden lassen.", 'SPONSOR_EMAIL_STREET_NR1' => "Strasse mit Hausnummer", 'SPONSOR_EMAIL_STREET_NR2' => "(noch Strasse; Zeile 2)", - 'SPONSOR_EMAIL_CNTRY_ZIP_CITY' => "Ländercode, PLZ, Wohnort", + 'SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY' => "Ländercode, PLZ, Wohnort", 'SPONSOR_PASS_UNCHANGED' => "- Nicht geändert! -", // Guest headers diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index a13a124877..aa1667045a 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -713,7 +713,7 @@ ORDER BY } } else { // Nothing selected - $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result @@ -759,7 +759,7 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id'); } else { // Nothing selected - $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result @@ -806,7 +806,7 @@ ORDER BY $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title'); } else { // Nothing selected - $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}'); + $content = returnErrorMessage('{--ADMIN_ENTRIES_404--}'); } // Free the result diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index b330fea6c1..2fc717896b 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -661,5 +661,54 @@ function doTemplateAdminRegisterCategoryTable ($templateName, $clear = FALSE, $c return registerGenerateCategoryTable('admin', $configEntry); } +// Template helper for generating a list of all activated user registration provider +function doTemplateGuestRegistrationList ($templateName, $clear = FALSE) { + // Init output + $content = ''; + + // Default is only activated provider + $addSql = " AND `provider_is_active`='Y'"; + + // Is admin logged-in? + if (isAdmin()) { + // Then show all + $addSql = ''; + } // END - if + + // Search for all + $result = sqlQuery("SELECT + `provider_name`, + `provider_extension` +FROM + `{?_MYSQL_PREFIX?}_user_register_provider` +WHERE + `provider_extension` != 'register' + " . $addSql . " +ORDER BY + `provider_name` ASC", __FUNCTION__, __LINE__); + + // Are there entries? + if (sqlNumRows($result) > 0) { + // Loop through all + $row = ''; + while ($content = sqlFetchArray($result)) { + // Load row template + $row .= loadTemplate('guest_registration_provider_row', TRUE, $content); + } // END - while + + // Load main template + $content = loadTemplate('guest_registration_provider', TRUE, $row); + } else { + // Nothing found + $content = returnMessage('{--GUEST_EXTRA_REGISTRATION_PROVIDER_404--}'); + } + + // Free result + sqlFreeResult($result); + + // Return the generated content + return $content; +} + // [EOF] ?> diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index e42defec89..b687617855 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -221,7 +221,7 @@ LIMIT 1", // Is this non-productive? if (isExtensionProductive() === FALSE) { // Issue warning - $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text']; + $taskData['text'] = returnMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}') . $taskData['text']; } // END - if // Set current extension name diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 14f786730a..beae9b8c35 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -119,14 +119,14 @@ ORDER BY $content['withdraw_form'] = loadTemplate('admin_list_beg_form', TRUE); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', TRUE); + $content['withdraw_form'] = returnMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}'); } // Prepare constant for timemark if (isExtensionActive('autopurge')) { $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2); } else { - $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', TRUE); + $content['autopurge_timeout'] = returnMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}'); } // Load final template diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index a9c155c40c..671c73589a 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -129,7 +129,7 @@ ORDER BY $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', TRUE); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = displayErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}', TRUE); + $content['withdraw_form'] = returnErrorMessage('{--ADMIN_BONUS_ALREADY_WITHDRAW--}'); } // Prepare constant for timemark diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index 702388ed31..4c4d676740 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -199,7 +199,7 @@ ORDER BY $content['list_out'] = loadTemplate('admin_list_sponsor_pay', TRUE, $OUT); } else { // Noting setup so far! - $content['list_out'] = displayMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}', TRUE); + $content['list_out'] = returnMessage('{--ADMIN_SPONSOR_NO_PAYTYPES--}'); } // Free memory diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 822d58d766..66bdca441a 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -191,7 +191,7 @@ LIMIT %s", $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT); } else { // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm. - $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE); + $OUT = returnMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}'); } // Prepare content diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 0750e18755..784f56f6c3 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -279,7 +279,7 @@ ORDER BY // Errors found? if (isFilledArray($formErrors)) { - $OUT = displayMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}', TRUE); + $OUT = returnMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}'); $OUT .= '
    '; foreach ($formErrors as $error) { $OUT .= '
  1. ' . $error . '
    2. '; diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index a7cdf89b31..0ccaac089a 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -73,7 +73,7 @@ switch ($mode) { // How far is last change on his profile away from now? if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) { // You cannot change your account - $content['change'] = displayMessage('
    {%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}
    ', TRUE); + $content['change'] = returnMessage('
    {%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}
    '); } else { // He is allowed to change his profile $content['change'] = loadTemplate('member_mydata_button', TRUE); diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index 529d73f50f..9581176d5c 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -110,7 +110,7 @@ if (!ifSqlHasZeroNums($result)) { $content['refbanner_content'] = loadTemplate('member_list_reflinks', TRUE, $OUT); } else { // No refbanner found - $content['refbanner_content'] = displayMessage('{--MEMBER_REFERRAL_BANNER_404--}', TRUE); + $content['refbanner_content'] = returnMessage('{--MEMBER_REFERRAL_BANNER_404--}'); } // Free result diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index 12390580ee..118f1b840b 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -84,7 +84,7 @@ if (!ifSqlHasZeroNums($result)) { $main_content['pool'] = loadTemplate('member_pool_table', TRUE, $OUT); } else { // No mails in pool! - $main_content['pool'] = displayMessage('{--MEMBER_NO_MAILS_IN_POOL--}', TRUE); + $main_content['pool'] = returnMessage('{--MEMBER_NO_MAILS_IN_POOL--}'); } // Free result @@ -128,7 +128,7 @@ if (!ifSqlHasZeroNums($result)) { $main_content['stats'] = loadTemplate('member_stats_table', TRUE, $OUT); } else { // No mail orders fond - $main_content['stats'] = displayMessage('{--MEMBER_NO_MAILS_IN_STATS--}', TRUE); + $main_content['stats'] = returnMessage('{--MEMBER_NO_MAILS_IN_STATS--}'); } // Free result diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 6dea4dd47a..74ebcfd9f2 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -234,7 +234,7 @@ switch ($mode) { sqlFreeResult($result); } else { // No one else is opt-in - $OUT = displayMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', TRUE); + $OUT = returnMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}'); $content['to_disabled'] = ' disabled="disabled"'; } @@ -256,7 +256,7 @@ switch ($mode) { $content['captcha_code'] = ' ' . $img; } else { $code = '00000'; - $content['captcha_code'] = displayMessage('{--MEMBER_TRANSFER_NO_CODE--}', TRUE); + $content['captcha_code'] = returnMessage('{--MEMBER_TRANSFER_NO_CODE--}'); } // Init points/reason diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index 7fa142b3f1..6a8b8efe78 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -118,10 +118,10 @@ if (sqlNumRows($result) == 1) { if (!empty($message)) { // Output message - $GLOBALS['sponsor_output'] = displayMessage($message, TRUE); + $GLOBALS['sponsor_output'] = returnMessage($message); } else { // No message generated - $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}'); } } else { // Output formular @@ -129,11 +129,11 @@ if (sqlNumRows($result) == 1) { } } else { // Locked or so? - $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}'); } } else { // Sponsor account not found - $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}'); } // Free memory diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index bd14fea02f..8ebaa2f874 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -105,10 +105,10 @@ if (sqlNumRows($result) == 1) { if (!empty($message)) { // Output message - $GLOBALS['sponsor_output'] = displayMessage($message, TRUE); + $GLOBALS['sponsor_output'] = returnMessage($message); } else { // No message generated - $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}'); } } else { // Make yes/no selection @@ -121,11 +121,11 @@ if (sqlNumRows($result) == 1) { } } else { // Locked or so? - $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}'); } } else { // Sponsor account not found - $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE); + $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}'); } // Free memory diff --git a/inc/template-functions.php b/inc/template-functions.php index 4ec0827401..70ffd792b1 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1982,15 +1982,27 @@ function translateTimeUnit ($unit) { } // Displays given message in admin_settings_saved template -function displayMessage ($message, $return = FALSE) { +function displayMessage ($message) { + // Call inner function + outputHtml(returnMessage($message)); +} + +// Returns given message in admin_settings_saved template +function returnMessage ($message) { + // Load the template + return loadTemplate('admin_settings_saved', TRUE, $message); +} + +// Displays given error message in admin_settings_unsaved template +function displayErrorMessage ($message) { // Load the template - return loadTemplate('admin_settings_saved', $return, $message); + outputHtml(returnErrorMessage($message)); } -// Displays given error message in admin_settings_saved template -function displayErrorMessage ($message, $return = FALSE) { +// Displays given error message in admin_settings_unsaved template +function returnErrorMessage ($message) { // Load the template - return loadTemplate('admin_settings_unsaved', $return, $message); + return loadTemplate('admin_settings_unsaved', TRUE, $message); } // Generates a selection box for (maybe) given gender diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl index 00bc991ec9..204177c1ed 100644 --- a/templates/de/emails/admin/admin_sponsor_change_data.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl @@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}) {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1]) {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2]) -{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city]) +{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city]) ------------------------------ {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone]) {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax]) diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl index d19c3edd74..5bf94dd255 100644 --- a/templates/de/emails/admin/admin_sponsor_change_email.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl @@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: {--SURNAME_FAMILY--}: $content[new_data][surname] $content[new_data][family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}) {--SPONSOR_EMAIL_STREET_NR1--}: $content[new_data][street_nr1] ($content[street_nr1]) {--SPONSOR_EMAIL_STREET_NR2--}: $content[new_data][street_nr2] ($content[street_nr2]) -{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city]) +{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[new_data][country]-$content[new_data][zip] $content[new_data][city] ($content[country]-$content[zip] $content[city]) ------------------------------ {--SPONSOR_ENTER_PHONE--}: $content[new_data][phone] ($content[phone]) {--SPONSOR_ENTER_FAX--}: $content[new_data][fax] ($content[fax]) diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl index 58bbec11f0..8f66a22789 100644 --- a/templates/de/emails/admin/admin_sponsor_edit.tpl +++ b/templates/de/emails/admin/admin_sponsor_edit.tpl @@ -16,7 +16,7 @@ Es sind folgende Daten gespeichert: {--SURNAME_FAMILY--}: {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%} {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] -{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city] +{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ------------------------------ {--SPONSOR_ENTER_PHONE--}: $content[phone] {--SPONSOR_ENTER_FAX--}: $content[fax] diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl index 2dbad9c007..6701bd7371 100644 --- a/templates/de/emails/sponsor/sponsor_change_data.tpl +++ b/templates/de/emails/sponsor/sponsor_change_data.tpl @@ -12,7 +12,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: {--SURNAME_FAMILY--}: $content[surname] $content[family] ({%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}) {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1] ({%sponsor,street_nr1=$content[id]%}) {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2] ({%sponsor,street_nr2=$content[id]%}) -{--SPONSOR_EMAIL_CNTRY_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineSponsorCountry=$content[id]%}-{%sponsor,zip,bigintval=$content[id]%} {%sponsor,city=$content[id]%}) +{--SPONSOR_EMAIL_COUNTRY_CODE_ZIP_CITY--}: $content[country]-$content[zip] $content[city] ({%sponsor,country,determineSponsorCountry=$content[id]%}-{%sponsor,zip,bigintval=$content[id]%} {%sponsor,city=$content[id]%}) ------------------------------ {--SPONSOR_ENTER_PHONE--}: $content[phone] ($content[phone]) {--SPONSOR_ENTER_FAX--}: $content[fax] ($content[fax]) diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index 696e1e96ad..a241a5c0e0 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -87,7 +87,7 @@ - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}: - diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index 941ad76f15..d023ca4f78 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -75,7 +75,7 @@ - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}: - diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index f26fe613c8..fb7121ca42 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -54,7 +54,7 @@ - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}: $content[country]-$content[zip]$content[city] diff --git a/templates/de/html/guest/guest_registration_select.tpl b/templates/de/html/guest/guest_registration_select.tpl new file mode 100644 index 0000000000..64e53fdfe6 --- /dev/null +++ b/templates/de/html/guest/guest_registration_select.tpl @@ -0,0 +1,16 @@ +
    +
    +
    + {--GUEST_SELECT_OTHER_REGISTRATION_FORM_TITLE--} +
    + +
    + {%template,GuestRegistrationList%} +
    +
    +
    + {--GUEST_SELECT_OTHER_REGISTRATION_FORM_NOTICE--} +
    +
    +
    +
    diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 61d520219d..075005eb24 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -101,7 +101,7 @@ - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}: - diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl index 170b57efad..f61b5544ae 100644 --- a/templates/de/html/sponsor/sponsor_account_form.tpl +++ b/templates/de/html/sponsor/sponsor_account_form.tpl @@ -82,7 +82,7 @@ - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + {--SPONSOR_ENTER_COUNTRY_CODE_ZIP_CITY--}: - -- 2.39.5