From a28637f0eb7975f2240c42d349e5f08a9722d9bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 4 Dec 2009 06:25:39 +0000 Subject: [PATCH] Major cleanup of old-school HTML-mess... --- .gitattributes | 1 + inc/cache/_compiled/html/.htaccess | 1 + inc/functions.php | 26 ++- inc/language/autopurge_de.php | 3 +- inc/language/de.php | 3 +- inc/language/doubler_de.php | 3 + inc/language/mods_de.php | 1 + inc/language/payout_de.php | 3 +- inc/language/primera_de.php | 87 ++++----- inc/language/register_de.php | 2 +- inc/language/sponsor_de.php | 4 +- inc/language/wernis_de.php | 121 ++++++------- inc/libs/bonus_functions.php | 2 +- inc/libs/rallye_functions.php | 24 +-- inc/libs/register_functions.php | 6 +- inc/libs/sponsor_functions.php | 2 +- inc/libs/user_functions.php | 8 +- inc/modules/admin/admin-inc.php | 3 - inc/modules/admin/what-adminedit.php | 2 +- inc/modules/admin/what-config_register.php | 36 ++-- inc/modules/admin/what-guestedit.php | 2 +- inc/modules/admin/what-list_bonus.php | 8 +- inc/modules/admin/what-list_primera.php | 2 +- inc/modules/admin/what-list_wernis.php | 2 +- inc/modules/admin/what-memedit.php | 6 +- inc/modules/guest/what-login.php | 4 +- inc/modules/member/what-order.php | 7 +- inc/modules/member/what-primera.php | 24 +-- inc/modules/member/what-wernis.php | 36 ++-- templates/de/html/admin/admin_add_banner.tpl | 53 +++--- .../de/html/admin/admin_add_points_all.tpl | 34 +--- .../de/html/admin/admin_add_rallye_prices.tpl | 50 ++---- templates/de/html/admin/admin_add_sponsor.tpl | 169 +++++------------- .../html/admin/admin_add_sponsor_already.tpl | 9 +- .../html/admin/admin_add_sponsor_paytype.tpl | 32 ++-- .../html/admin/admin_admins_contct_form.tpl | 8 +- .../html/admin/admin_admins_contct_select.tpl | 6 +- .../de/html/admin/admin_amenu_delete_row.tpl | 6 +- .../de/html/admin/admin_amenu_edit_row.tpl | 66 +++---- .../de/html/admin/admin_config_admin.tpl | 17 +- .../de/html/admin/admin_config_autopurge.tpl | 115 +++--------- .../de/html/admin/admin_config_birthday.tpl | 47 ++--- .../de/html/admin/admin_config_bonus.tpl | 1 - .../html/admin/admin_config_email_del_row.tpl | 25 +-- .../admin/admin_config_email_edit_row.tpl | 19 +- .../de/html/admin/admin_config_home_main.tpl | 14 +- .../de/html/admin/admin_config_newsletter.tpl | 9 +- .../de/html/admin/admin_config_nickname.tpl | 36 ++-- .../de/html/admin/admin_config_order_form.tpl | 57 ++---- .../de/html/admin/admin_config_other.tpl | 6 +- .../de/html/admin/admin_config_primera.tpl | 14 +- .../admin/admin_config_rallye_edit_row.tpl | 24 +-- .../html/admin/admin_config_rewrite_rows.tpl | 9 +- .../de/html/admin/admin_config_stats.tpl | 52 ++---- .../de/html/admin/admin_config_surfbar.tpl | 1 - .../de/html/admin/admin_config_title.tpl | 54 ++---- .../de/html/admin/admin_config_transfer.tpl | 39 +--- .../de/html/admin/admin_config_wernis.tpl | 135 ++++---------- .../de/html/admin/admin_del_cats_row.tpl | 19 +- .../de/html/admin/admin_del_payments_row.tpl | 19 +- templates/de/html/admin/admin_del_sponsor.tpl | 54 +++--- .../de/html/admin/admin_edit_admins_row.tpl | 39 ++-- templates/de/html/admin/admin_edit_cats.tpl | 6 +- .../de/html/admin/admin_edit_cats_row.tpl | 35 ++-- templates/de/html/admin/admin_edit_email.tpl | 9 +- .../de/html/admin/admin_edit_email_row.tpl | 8 +- .../de/html/admin/admin_edit_email_select.tpl | 4 +- .../de/html/admin/admin_edit_payments_row.tpl | 28 +-- .../de/html/admin/admin_edit_rallyes_row.tpl | 78 ++------ .../admin/admin_edit_sponsor_add_points.tpl | 33 ++-- .../de/html/admin/admin_edit_sponsor_edit.tpl | 107 +++-------- .../admin/admin_edit_sponsor_sub_points.tpl | 33 ++-- .../de/html/admin/admin_email_archiv_row.tpl | 40 ++--- .../de/html/admin/admin_email_nav_row.tpl | 7 +- .../de/html/admin/admin_extensions_delete.tpl | 2 + .../admin/admin_extensions_delete_row.tpl | 4 +- .../de/html/admin/admin_gmenu_delete_row.tpl | 13 +- .../de/html/admin/admin_gmenu_edit_row.tpl | 50 +++--- .../de/html/admin/admin_gmenu_status.tpl | 19 +- .../de/html/admin/admin_list_autopurge.tpl | 4 +- templates/de/html/admin/admin_list_beg.tpl | 16 +- .../de/html/admin/admin_list_beg_rows.tpl | 6 +- templates/de/html/admin/admin_list_bonus.tpl | 23 ++- .../admin/admin_list_bonus_emails_row.tpl | 50 +++--- .../de/html/admin/admin_list_bonus_rows.tpl | 6 +- .../html/admin/admin_list_doubler_already.tpl | 6 +- .../html/admin/admin_list_doubler_waiting.tpl | 6 +- .../admin/admin_list_notify_emails_row.tpl | 4 - .../de/html/admin/admin_list_primera_main.tpl | 19 +- .../html/admin/admin_list_rallye_prices.tpl | 8 +- .../de/html/admin/admin_list_refs_row.tpl | 8 +- .../html/admin/admin_list_sponsor_details.tpl | 84 ++++----- .../de/html/admin/admin_list_theme_row.tpl | 18 +- .../de/html/admin/admin_list_transfer_row.tpl | 2 +- .../de/html/admin/admin_list_unconfirmed.tpl | 8 +- .../html/admin/admin_list_unconfirmed_row.tpl | 8 +- .../de/html/admin/admin_list_user_row.tpl | 10 +- .../de/html/admin/admin_list_wernis_main.tpl | 16 +- .../admin/admin_list_yoomedia_tm_already.tpl | 2 +- .../html/admin/admin_list_yoomedia_tm_row.tpl | 2 +- .../de/html/admin/admin_lock_sponsor.tpl | 56 +++--- templates/de/html/admin/admin_login_form.tpl | 12 +- templates/de/html/admin/admin_main_footer.tpl | 2 +- .../de/html/admin/admin_maintenance_form.tpl | 36 ++-- templates/de/html/admin/admin_menu_failed.tpl | 26 +-- .../de/html/admin/admin_menu_unknown_okay.tpl | 20 +-- templates/de/html/admin/admin_mini_online.tpl | 12 +- .../de/html/admin/admin_mmenu_delete_row.tpl | 6 +- .../de/html/admin/admin_mmenu_edit_row.tpl | 50 +++--- templates/de/html/admin/admin_mods_stats2.tpl | 9 +- templates/de/html/admin/admin_newsletter.tpl | 80 +++------ .../de/html/admin/admin_newsletter_nohtml.tpl | 67 +++---- .../de/html/admin/admin_optimize_row.tpl | 6 +- .../html/admin/admin_payout_accept_form.tpl | 57 +++--- .../de/html/admin/admin_payout_add_new.tpl | 87 +++------ .../html/admin/admin_payout_reject_form.tpl | 16 +- .../de/html/admin/admin_points_del_row.tpl | 13 +- .../de/html/admin/admin_points_edit_row.tpl | 8 +- .../de/html/admin/admin_refbanner_edit.tpl | 4 +- .../html/admin/admin_refbanner_edit_row.tpl | 25 +-- templates/de/html/admin/admin_reg_form.tpl | 12 +- .../de/html/admin/admin_reset_password.tpl | 6 +- .../html/admin/admin_reset_password_form.tpl | 18 +- .../de/html/admin/admin_send_bonus_form.tpl | 57 +----- .../de/html/admin/admin_send_reset_link.tpl | 6 +- .../html/admin/admin_unlock_emails_redir.tpl | 2 +- .../admin/admin_unlock_emails_redir_row.tpl | 4 +- .../admin/admin_validate_reset_hash_form.tpl | 6 +- templates/de/html/admin/admin_welcome.tpl | 12 +- templates/de/html/guest/guest_active_row.tpl | 6 +- templates/de/html/guest/guest_cat_row.tpl | 17 +- .../de/html/guest/guest_confirm_link.tpl | 22 +-- .../de/html/guest/guest_doubler_list.tpl | 15 +- templates/de/html/guest/guest_header.tpl | 6 +- templates/de/html/guest/guest_menu_whats.tpl | 7 +- templates/de/html/guest/guest_no_rallyes.tpl | 25 +-- templates/de/html/guest/guest_register.tpl | 16 +- .../de/html/guest/guest_register_refid.tpl | 6 +- .../html/guest/guest_register_refid_hide.tpl | 7 +- .../de/html/guest/guest_sponsor_activate.tpl | 17 +- .../de/html/guest/guest_sponsor_infos.tpl | 25 ++- .../de/html/guest/guest_sponsor_login.tpl | 24 +-- .../de/html/guest/guest_stats_cats_row.tpl | 3 +- .../de/html/guest/guest_stats_member.tpl | 18 +- .../de/html/guest/guest_stats_month_row.tpl | 1 - templates/de/html/guest/guest_stats_row.tpl | 4 +- .../de/html/guest/guest_top10_empty4.tpl | 6 +- .../de/html/guest/guest_top10_empty5.tpl | 8 +- .../de/html/guest/guest_top10_row_earner.tpl | 9 +- .../de/html/guest/guest_top10_row_login.tpl | 8 +- .../de/html/guest/guest_top10_row_refs.tpl | 11 +- templates/de/html/impressum.tpl | 30 ++-- templates/de/html/install/install_page1.tpl | 12 +- templates/de/html/install/install_page2.tpl | 34 ++-- templates/de/html/install/install_page3.tpl | 57 +++--- templates/de/html/install/install_page5.tpl | 93 +++++----- templates/de/html/mailid/mailid_timer.tpl | 10 +- .../de/html/member/member_doubler_list.tpl | 18 +- templates/de/html/member/member_header.tpl | 12 +- .../html/member/member_holiday_deactivate.tpl | 37 +--- .../de/html/member/member_holiday_form.tpl | 8 +- .../html/member/member_html_mail_settings.tpl | 6 +- .../de/html/member/member_menu_whats.tpl | 7 +- .../de/html/member/member_mydata_overview.tpl | 41 ++--- .../de/html/member/member_nickname_form.tpl | 2 +- .../html/member/member_order-html_intro.tpl | 2 +- .../de/html/member/member_order-zip1.tpl | 6 +- .../de/html/member/member_order-zip2.tpl | 2 +- templates/de/html/member/member_payout.tpl | 9 +- .../de/html/member/member_payout_form.tpl | 2 +- .../html/member/member_payout_form_banner.tpl | 2 +- templates/de/html/member/member_points.tpl | 38 ++-- .../html/member/member_points_bonus_rows.tpl | 36 ++-- .../de/html/member/member_points_row.tpl | 4 +- .../html/member/member_primera_mode_list.tpl | 6 +- .../html/member/member_primera_mode_pay.tpl | 39 ++-- .../html/member/member_profile_outdated.tpl | 6 +- .../de/html/member/member_reflinks_row.tpl | 11 -- .../de/html/member/member_reflinks_table.tpl | 5 + .../member/member_surfbar_book_dynamic.tpl | 4 +- .../member/member_surfbar_book_static.tpl | 4 +- .../member_surfbar_delete_action_form.tpl | 4 +- .../member_surfbar_edit_action_form.tpl | 4 +- .../de/html/member/member_surfbar_link.tpl | 2 +- .../member/member_surfbar_start_dynamic.tpl | 2 +- .../member/member_surfbar_start_static.tpl | 2 +- .../de/html/member/member_transfer_list.tpl | 2 +- .../de/html/member/member_transfer_new.tpl | 28 ++- .../html/member/member_wernis_mode_choose.tpl | 8 +- .../html/member/member_wernis_mode_list.tpl | 6 +- .../html/member/member_wernis_mode_payout.tpl | 46 ++--- .../member/member_wernis_mode_withdraw.tpl | 43 ++--- templates/de/html/sponsor/sponsor_main.tpl | 2 +- templates/de/html/sponsor/sponsor_what.tpl | 7 +- .../de/html/surfbar/surfbar_frame_start.tpl | 4 +- .../de/html/surfbar/surfbar_login_form.tpl | 35 +--- templates/de/html/surfbar/surfbar_stopped.tpl | 2 +- 197 files changed, 1634 insertions(+), 2531 deletions(-) create mode 100644 inc/cache/_compiled/html/.htaccess diff --git a/.gitattributes b/.gitattributes index ac51f2424b..e342c486e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -97,6 +97,7 @@ inc/autopurge/purge-tsks.php -text inc/autopurge/purge-unconfirmed.php -text inc/cache/.htaccess -text inc/cache/_compiled/.htaccess -text +inc/cache/_compiled/html/.htaccess -text inc/cache/_compiled/templates/.htaccess -text inc/classes/.htaccess -text inc/classes/cachesystem.class.php -text diff --git a/inc/cache/_compiled/html/.htaccess b/inc/cache/_compiled/html/.htaccess new file mode 100644 index 0000000000..3a42882788 --- /dev/null +++ b/inc/cache/_compiled/html/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/functions.php b/inc/functions.php index 3699d4ea8f..0dbe4ae0d2 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1648,10 +1648,9 @@ function createFancyTime ($stamp) { // Generates a navigation row for listing emails function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) { - $SEP = ''; $TOP = ''; + $TOP = ''; if ($show_form === false) { $TOP = " top"; - $SEP = " "; } $NAV = ''; @@ -1687,7 +1686,6 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals $content['nav'] = $NAV; $content['span'] = $colspan; $content['top'] = $TOP; - $content['sep'] = $SEP; // Load navigation template $OUT = loadTemplate('admin_email_nav_row', true, $content); @@ -3685,7 +3683,7 @@ function isTemplateCached ($template) { // Do we have cached this result? if (!isset($GLOBALS['template_cache'][$template])) { // Generate FQFN - $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + $FQFN = generateCacheFqfn($template); // Is it there? $GLOBALS['template_cache'][$template] = isFileReadable($FQFN); @@ -3700,7 +3698,7 @@ function flushTemplateCache ($template, $eval) { // Is this cache flushed? if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template) === false) && ($eval != '404')) { // Generate FQFN - $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + $FQFN = generateCacheFqfn($template); // Replace username with a call $eval = str_replace('$username', '".getUsername()."', $eval); @@ -3715,7 +3713,7 @@ function readTemplateCache ($template) { // Check it again if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) { // Generate FQFN - $FQFN = sprintf("%s_compiled/templates/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + $FQFN = generateCacheFqfn($template); // And read from it $GLOBALS['template_eval'][$template] = readFromFile($FQFN); @@ -4017,6 +4015,18 @@ function generateMetaDescriptionCode () { unset($GLOBALS['ref_level']); } +// Generates an FQFN for template cache from the given template name +function generateCacheFqfn ($template) { + // Is this cached? + if (!isset($GLOBALS['template_cache_fqfn'][$template])) { + // Generate the FQFN + $GLOBALS['template_cache_fqfn'][$template] = sprintf("%s_compiled/html/%s.tpl.cache", getConfig('CACHE_PATH'), $template); + } // END - if + + // Return it + return $GLOBALS['template_cache_fqfn'][$template]; +} + ////////////////////////////////////////////////// // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // ////////////////////////////////////////////////// @@ -4031,7 +4041,7 @@ if (!function_exists('html_entity_decode')) { } // END - if if (!function_exists('http_build_query')) { - // Taken from documentation on www.php.net, credits to Marco K. (Germany) + // Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder function http_build_query($data, $prefix = '', $sep = '', $key = '') { $ret = array(); foreach ((array)$data as $k => $v) { @@ -4039,7 +4049,7 @@ if (!function_exists('http_build_query')) { $k = urlencode($prefix . $k); } // END - if - if ((!empty($key)) || ($key === 0)) $k = $key.'['.urlencode($k).']'; + if ((!empty($key)) || ($key === 0)) $k = $key . '[' . urlencode($k) . ']'; if (is_array($v) || is_object($v)) { array_push($ret, http_build_query($v, '', $sep, $k)); diff --git a/inc/language/autopurge_de.php b/inc/language/autopurge_de.php index 5175bc770c..10853817a4 100644 --- a/inc/language/autopurge_de.php +++ b/inc/language/autopurge_de.php @@ -70,10 +70,11 @@ addMessages(array( 'ADMIN_AUTOPURGE_NOTIFY_INACTIVE' => "Benachrichtigung bei inaktive Accounts löschen", 'ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED' => "Benachrichtigung bei unbestätigte Accounts löschen", 'ADMIN_AUTOPURGE_NOTIFY_TASKS' => "Benachrichtigung bei veraltete Aufgaben löschen", + 'ADMIN_LIST_AUTOPURGE_FOOTER' => "Hier sollte ein Hinweis kommen.", 'AUTOPURGE_NOTIFIED' => "Benachrichtigt", 'ADMIN_AUTOPURGE_DEL_MAILS_TITLE' => "Mails von gelöschten Mitgliedern löschen", - 'ADMIN_AUTOPURGE_DEL_MAILS' => "Sollen die Mailbuchungen von be bnreits gelöschten Mitgliedern gelöscht werden?", + 'ADMIN_AUTOPURGE_DEL_MAILS' => "Sollen die Mailbuchungen von bereits gelöschten Mitgliedern gelöscht werden?", 'ADMIN_AUTOPURGE_DEL_MAILS_TIME' => "Dauer bis Mails gelöscht werden", 'ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS' => "Benachrichtigen bei Löschung von Mails", diff --git a/inc/language/de.php b/inc/language/de.php index 1d256adbc6..e5df113cfe 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -153,7 +153,7 @@ addMessages(array( 'SUBMIT_CHANGES' => "Änderungen durchführen", 'ENTRY_404_1' => "Eintrag ", 'ENTRY_404_2' => " wurde nicht gefunden.", - 'EDIT_UNKNOWN_OKAY' => "Es wurde eine unbekannte Aktion durchgeführt.", + 'ADMIN_UNKNOWN_OKAY' => "Es wurde eine unbekannte Aktion %s durchgeführt.", 'DEL_ADMIN_MENU' => "Admin-Menüeinträge löschen", 'DEL_MENU_1' => "Es soll/sollen ", 'DEL_MENU_2' => " Menüeintrag/-einträge gelöscht werden:", @@ -1150,6 +1150,7 @@ addMessages(array( 'ADMIN_ENTRIES_404' => "Es wurden keine Einträge gefunden.", 'DEBUG_REPORT_BUG_SUBJECT' => "[BUG!] Es wurde ein Bug im Script erkannt:", 'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung %s kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.", + 'MEMBER_REFLINKS_FOOTER' => "Ihr Referal-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referals. (Aber Ihren Referal-Link bewerben schadet auch nicht... ;-) )", 'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail %s bestätigt.", 'MEMBER_MAIL_NORMAL_CONFIRMED_ON' => "Sie haben diese Klickmail %s bestätigt.", diff --git a/inc/language/doubler_de.php b/inc/language/doubler_de.php index c17608245b..dece983ede 100644 --- a/inc/language/doubler_de.php +++ b/inc/language/doubler_de.php @@ -143,6 +143,9 @@ addMessages(array( 'DOUBLER_POINTS_LEFT_2' => "zum Verdoppeln zur Verfügung.", 'DOUBLER_USAGE_COUNTER_1' => "Der Verdoppler wurde bereits", 'DOUBLER_USAGE_COUNTER_2' => "mal genutzt.", + 'MEMBER_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.", + 'GUEST_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.", + 'ADMIN_DOUBLER_FOOTER' => "Hier sollte noch ein guter Hinweis stehen.", )); // [EOF] diff --git a/inc/language/mods_de.php b/inc/language/mods_de.php index b40d58324a..958c0ba831 100644 --- a/inc/language/mods_de.php +++ b/inc/language/mods_de.php @@ -55,6 +55,7 @@ addMessages(array( 'MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul auswählen.", 'MODS_CHANGED' => "Module wurden geändert.", 'MODS_WHAT_ACTION' => "Menüpunkt (Hauptmenü)", + 'ADMIN_MODS_STATS_FOOTER' => "Hier soll ein Hinweis hinkommen.", )); // [EOF] diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index 372d8dd79d..f70cc76664 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -122,7 +122,8 @@ addMessages(array( 'PAYOUT_REJECTED_NOTIFIED' => "Anfrage abgelehnt! Das Mitglied wurde benachrichtigt.", 'PAYOUT_ACCEPTED_SUBJECT' => "[Auszahlunganfrage:] Angenommen.", 'PAYOUT_REJECTED_SUBJECT' => "[Auszahlunganfrage:] Abgelehnt.", - 'PAYOUT_MEMBER_LIST_PAYOUTS' => "Ihre Auszahlungsanfragen", + 'MEMBER_PAYOUT_LIST_TITLE' => "Ihre Auszahlungsanfragen", + 'MEMBER_PAYOUT_LIST_FOOTER' => "Bitte kontaktieren Sie nicht gleich den Support, wenn Ihre Auszahlung nicht sofort getätigt wurde.", 'PAYOUT_OPTIONAL_PASSWORD' => "Optionales Passwort", 'PAYOUT_ADMIN_NO_REQUESTS_FOUND' => "Keine Auszahlungsanfragen von Ihren Mitgliedern erhalten.", 'PAYOUT_REASON_PAYOUT' => "{?POINTS?}-Transfer von {?MAIN_TITLE?}", diff --git a/inc/language/primera_de.php b/inc/language/primera_de.php index 90de948b1f..14dc78a826 100644 --- a/inc/language/primera_de.php +++ b/inc/language/primera_de.php @@ -45,20 +45,20 @@ if (!defined('__SECURITY')) { addMessages(array( 'ADMIN_TASK_LIST_PRIMERA_ALL' => "Alle Primera-Ein-/Auszahlungen", 'ADMIN_TASK_LIST_PRIMERA_ALL_TITLE' => "Listet alle Primera-Ein- und Auszahlungen auf.", - 'PRIMERA_ADMIN_CONFIG_TITLE' => "Einstellungen zum Primus-Portal:", - 'PRIMERA_ADMIN_MIN_PAYOUT' => "Minimumguthaben für Auszahlungen.", - 'PRIMERA_ADMIN_MIN_WITHDRAW' => "Minimumguthaben für Einzahlungen.", - 'PRIMERA_ADMIN_API_NAME' => "Primus-Nickname", - 'PRIMERA_ADMIN_API_MD5' => "Primera-Passwort (Wird als MD5-Hash gespeichert)", - 'PRIMERA_ADMIN_API_REFID' => "Primus-Referal-Id (???)", - 'PRIMERA_ADMIN_CONFIG_NOTE' => "Hier können Sie sich ein Primus-Portal-Account holen. Geben Sie immer Ihren Usernamen von Primus-Portal ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von Primera benötigt.", - 'PRIMERA_ADMIN_NO_TRANSFERS' => "Derzeit keine Primera transferiert.", - 'PRIMERA_ADMIN_ACCOUNT' => "Account bei Primus-Portal", - 'PRIMERA_ADMIN_TRANSFERED' => "Primera transferiert", - 'PRIMERA_ADMIN_TIMESTAMP' => "Zeitpunkt Überweisung", - 'PRIMERA_ADMIN_TYPE' => "Überweisungsrichtung", - 'PRIMERA_ADMIN_API_MESSAGE' => "Nachricht von Primus-API", - 'PRIMERA_ADMIN_API_STATUS' => "Status von Primus-API", + 'ADMIN_PRIMERA_CONFIG_TITLE' => "Einstellungen zum Primus-Portal:", + 'ADMIN_PRIMERA_MIN_PAYOUT' => "Minimumguthaben für Auszahlungen.", + 'ADMIN_PRIMERA_MIN_WITHDRAW' => "Minimumguthaben für Einzahlungen.", + 'ADMIN_PRIMERA_API_NAME' => "Primus-Nickname", + 'ADMIN_PRIMERA_API_MD5' => "Primera-Passwort (Wird als MD5-Hash gespeichert)", + 'ADMIN_PRIMERA_API_REFID' => "Primus-Referal-Id (???)", + 'ADMIN_PRIMERA_CONFIG_NOTE' => "Hier können Sie sich ein Primus-Portal-Account holen. Geben Sie immer Ihren Usernamen von Primus-Portal ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von Primera benötigt.", + 'ADMIN_PRIMERA_NO_TRANSFERS' => "Derzeit keine Primera transferiert.", + 'ADMIN_PRIMERA_ACCOUNT' => "Account bei Primus-Portal", + 'ADMIN_PRIMERA_TRANSFERED' => "Primera transferiert", + 'ADMIN_PRIMERA_TIMESTAMP' => "Zeitpunkt Überweisung", + 'ADMIN_PRIMERA_TYPE' => "Überweisungsrichtung", + 'ADMIN_PRIMERA_API_MESSAGE' => "Nachricht von Primus-API", + 'ADMIN_PRIMERA_API_STATUS' => "Status von Primus-API", 'MEMBER_PRIMERA_MODE_WITHDRAW' => "Primera einzahlen", 'MEMBER_PRIMERA_MODE_PAYOUT' => "Primera auszahlen", 'PRIMERA_STATUS_UNKNWOWN' => "Primera-Typ %s unbekannt.", @@ -68,7 +68,8 @@ addMessages(array( 'PRIMERA_TIMESTAMP' => "Buchungszeitmarke", 'PRIMERA_ACCOUNT' => "Primus-Portal", 'PRIMERA_TOTAL_PRIMERA' => "Gesamt überwiesen", - 'PRIMERA_MEMBER_LIST_PRIMERA' => "Überweisungsliste von/an Primus-Portal", + 'MEMBER_PRIMERA_LIST_PRIMERA' => "Überweisungsliste von/an Primus-Portal", + 'ADMIN_PRIMERA_FOOTER' => "Es sollte hier ein Hinweis eingebaut werden.", // API messages 'PRIMERA_API_REQUEST_DATA_INVALID' => "Interner Fehler: Abfragedaten sind defekt.", @@ -88,34 +89,34 @@ addMessages(array( 'PRIMERA_UNKNOWN_ERROR' => "Unbekannter Fehler aufgetreten.", // Member messages - 'PRIMERA_MEMBER_NO_ACCOUNT' => "Noch kein Primus-Account? Hier entlang.", - 'PRIMERA_MEMBER_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten müssen.", - 'PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT' => "Sie haben nicht genügend Primera zum Auszahlen! Mindestens: {%config,translateComma=primera_min_payout%} Primera.", - 'PRIMERA_MEMBER_WITHDRAW_TITLE' => "Primera bei {?MAIN_TITLE?} einzahlen:", - 'PRIMERA_MEMBER_WITHDRAW_POINTS_ACCOUNT' => "Primera hier im Account:", - 'PRIMERA_MEMBER_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Primera-Guthaben:", - 'PRIMERA_MEMBER_WITHDRAW_SUBMIT' => "Primera jetzt einzahlen", - 'PRIMERA_MEMBER_WITHDRAW_NOTE' => "Ihr Primera-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Primera-Betrag nur gerade Beträge eingeben! Ihr Primera-Account sollte ausreichend Deckung aufweisen.", - 'PRIMERA_MEMBER_PAYOUT_TITLE' => "Primera auf Ihr Portal-Account auszahlen", - 'PRIMERA_MEMBER_PAYOUT_POINTS' => "Auszahlfähiges Primera-Guthaben", - 'PRIMERA_MEMBER_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Primera-Guthaben", - 'PRIMERA_MEMBER_PAYOUT_SUBMIT' => "Auszahlung durchführen", - 'PRIMERA_MEMBER_PAYOUT_NOTE' => "Ihr Primera-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Primera-Betrag nur gerade Beträge eingeben! Überprüfen Sie vor dem Absenden Ihren Primus-Usernamen.", - 'PRIMERA_MEMBER_NICKNAME' => "Username bei Primus-Portal: [Vergessen?]", - 'PRIMERA_MEMBER_PASSWORD' => "Primera-Passwort (nicht Accountpasswort!): [Vergessen?]", - 'PRIMERA_MEMBER_AMOUNT' => "Zu überweisenden Betrag eingeben:", - 'PRIMERA_MEMBER_MODE_INVALID' => "Ungültiger Modus %s erkannt! Bitte links im Menü fortfahren.", - 'PRIMERA_MEMBER_EMPTY_USERNAME' => "Sie haben Ihren Primus-Usernamen nicht eingegeben.", - 'PRIMERA_MEMBER_EMPTY_PASSWORD' => "Sieh haben kein Primera-Passwort eingegeben.", - 'PRIMERA_MEMBER_EMPTY_AMOUNT' => "Sie haben keine zu überweisende Betrag angegeben.", - 'PRIMERA_MEMBER_INVALID_USERNAME' => "Bitte nur Zahlen für den Primus-Usernamen eingeben.", - 'PRIMERA_MEMBER_INVALID_AMOUNT' => "Bitte nur Zahlen für den zu überweisenden Betrag eingeben.", - 'PRIMERA_MEMBER_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=primera_min_payout%} Primera an.", - 'PRIMERA_MEMBER_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", - 'PRIMERA_MEMBER_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", - 'PRIMERA_MEMBER_PAYOUT_DONE' => "Auszahlung auf Primus-Portal erfolgreich abgeschlossen. :-)", - 'PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Primera auszahlen, da Sie nur %s übrig haben.", - 'PRIMERA_MEMBER_STATUS' => "Überweisungsart", + 'MEMBER_PRIMERA_NO_ACCOUNT' => "Noch kein Primus-Account? Hier entlang.", + 'MEMBER_PRIMERA_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten müssen.", + 'MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT' => "Sie haben nicht genügend Primera zum Auszahlen! Mindestens: {%config,translateComma=primera_min_payout%} Primera.", + 'MEMBER_PRIMERA_WITHDRAW_TITLE' => "Primera bei {?MAIN_TITLE?} einzahlen:", + 'MEMBER_PRIMERA_WITHDRAW_POINTS_ACCOUNT' => "Primera hier im Account:", + 'MEMBER_PRIMERA_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Primera-Guthaben:", + 'MEMBER_PRIMERA_WITHDRAW_SUBMIT' => "Primera jetzt einzahlen", + 'MEMBER_PRIMERA_WITHDRAW_NOTE' => "Ihr Primera-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Primera-Betrag nur gerade Beträge eingeben! Ihr Primera-Account sollte ausreichend Deckung aufweisen.", + 'MEMBER_PRIMERA_PAYOUT_TITLE' => "Primera auf Ihr Portal-Account auszahlen", + 'MEMBER_PRIMERA_PAYOUT_POINTS' => "Auszahlfähiges Primera-Guthaben", + 'MEMBER_PRIMERA_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Primera-Guthaben", + 'MEMBER_PRIMERA_PAYOUT_SUBMIT' => "Auszahlung durchführen", + 'MEMBER_PRIMERA_PAYOUT_NOTE' => "Ihr Primera-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Primera-Betrag nur gerade Beträge eingeben! Überprüfen Sie vor dem Absenden Ihren Primus-Usernamen.", + 'MEMBER_PRIMERA_NICKNAME' => "Username bei Primus-Portal: [Vergessen?]", + 'MEMBER_PRIMERA_PASSWORD' => "Primera-Passwort (nicht Accountpasswort!): [Vergessen?]", + 'MEMBER_PRIMERA_AMOUNT' => "Zu überweisenden Betrag eingeben:", + 'MEMBER_PRIMERA_MODE_INVALID' => "Ungültiger Modus %s erkannt! Bitte links im Menü fortfahren.", + 'MEMBER_PRIMERA_EMPTY_USERNAME' => "Sie haben Ihren Primus-Usernamen nicht eingegeben.", + 'MEMBER_PRIMERA_EMPTY_PASSWORD' => "Sieh haben kein Primera-Passwort eingegeben.", + 'MEMBER_PRIMERA_EMPTY_AMOUNT' => "Sie haben keine zu überweisende Betrag angegeben.", + 'MEMBER_PRIMERA_INVALID_USERNAME' => "Bitte nur Zahlen für den Primus-Usernamen eingeben.", + 'MEMBER_PRIMERA_INVALID_AMOUNT' => "Bitte nur Zahlen für den zu überweisenden Betrag eingeben.", + 'MEMBER_PRIMERA_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=primera_min_payout%} Primera an.", + 'MEMBER_PRIMERA_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", + 'MEMBER_PRIMERA_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", + 'MEMBER_PRIMERA_PAYOUT_DONE' => "Auszahlung auf Primus-Portal erfolgreich abgeschlossen. :-)", + 'MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Primera auszahlen, da Sie nur %s übrig haben.", + 'MEMBER_PRIMERA_STATUS' => "Überweisungsart", )); // [EOF] diff --git a/inc/language/register_de.php b/inc/language/register_de.php index b7167746b9..c87f4c0d95 100644 --- a/inc/language/register_de.php +++ b/inc/language/register_de.php @@ -48,7 +48,7 @@ addMessages(array( 'REGISTER_CHANGE_MUST' => "Einstellungen ändern", 'REGISTER_FIELD_NAME' => "Eingabefeld", 'REGISTER_FIELD_REQUIRED' => "Pflichtfeld?", - 'REGISTER_ADMIN_CHANGES_SAVED' => "Änderungen gespeichert.", + 'REGISTER_ADMIN_CHANGES_SAVED' => "Es wurden %s Pflichtfelder aktualisiert.", 'REGISTER_SURNAME_REQUIRED' => "Bitte geben Sie Ihren Vornamen ein.", 'REGISTER_FAMILY_REQUIRED' => "Bitte geben Sie Ihren Nachnamen ein.", 'REGISTER_STREET_NR_REQUIRED' => "Bitte geben Sie Straße und Hausnummer ein.", diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 7ba818d2e3..4d155b7ab6 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -185,7 +185,9 @@ addMessages(array( 'GUEST_SPONSOR_WANT_BECOME_HEADER' => "Sie wollen unser Sponsor sein?", 'GUEST_SPONSOR_INFOS_PRICING_HEADER' => "Hier sind Preise und was Sie für Ihr Geld bekommen.", 'GUEST_SPONSOR_PRICING_HEADER' => "Unsere Preise sind einfach fair! Schauen Sie selbst:", - 'GUEST_SPONSOR_ACTIONS_HEADER' => "Und das bekommen Sie von uns:", + 'GUEST_SPONSOR_ACTIONS_HEADER' => "Das bekommen Sie von uns:", + 'GUEST_SPONSOR_PRICING_FOOTER' => "Vergleichen Sie mal...", + 'GUEST_SPONSOR_ACTIONS_FOOTER' => "Und was bieten Ihnen andere?", // Link descriptions 'ADMIN_SPONSOR_DETAILS_LINK_TITLE' => "Details des Sponsorenaccounts anzeigen", diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index 7051460c76..652e0b4e5c 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -54,35 +54,36 @@ addMessages(array( 'WERNIS_TIMESTAMP' => "Buchungszeitmarke", 'WERNIS_ACCOUNT' => "WDS66-Hauptaccount", 'WERNIS_TOTAL_WERNIS' => "Gesamt überwiesen", - 'WERNIS_MEMBER_LIST_WERNIS' => "Überweisungsliste von/an WDS66-Hauptaccount", + 'MEMBER_WERNIS_LIST_WERNIS' => "Überweisungsliste von/an WDS66-Hauptaccount", -// Admin messages - 'WERNIS_ADMIN_CONFIG_TITLE' => "Einstellungen zum WDS66-Hauptaccount:", - 'WERNIS_ADMIN_MIN_PAYOUT' => "Minimumguthaben für Auszahlungen.", - 'WERNIS_ADMIN_MIN_WITHDRAW' => "Minimumguthaben für Einzahlungen.", - 'WERNIS_ADMIN_API_ID' => "WDS66-API-Id (api_id=x)", - 'WERNIS_ADMIN_API_MD5' => "WDS66-API-Key (api_md5=xxxxx; 32-stellig)", - 'WERNIS_ADMIN_API_URL' => "Basis-URL der API-Skripte", - 'WERNIS_ADMIN_REFID' => "Ihre Referal-Id bei WDS66-Portal (= Ihr Username!)", - 'WERNIS_ADMIN_WPASS' => "Wernis-Passwort (nicht Account-Passwort!)", - 'WERNIS_ADMIN_CONFIG_NOTE' => "[Hier] können Sie schon für einmalig kostenlos 25.000 Abfragen ein API-Account beantragen (dazu ist ein kostenloses Wernis-Account dennoch nötig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von und nach WDS66-Wernis-Portal benötigt. Die Betreibergebühren und Umrechnungsfaktoren sind für den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese müssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen.", - 'WERNIS_ADMIN_NO_TRANSFERS' => "Derzeit keine Wernis transferiert.", - 'WERNIS_ADMIN_WDS66_ACCOUNT' => "Account bei WDS66-Portal", - 'WERNIS_ADMIN_TRANSFERED' => "Wernis transferiert", - 'WERNIS_ADMIN_TIMESTAMP' => "Zeitpunkt Überweisung", - 'WERNIS_ADMIN_TYPE' => "Überweisungsrichtung", - 'WERNIS_ADMIN_API_MESSAGE' => "Nachricht von WDS66-API", - 'WERNIS_ADMIN_API_STATUS' => "Status von WDS66-API", - 'WERNIS_ADMIN_PAYOUT_ACTIVE' => "Auszahlungen zum WDS66-Portal aktiviert?", - 'WERNIS_ADMIN_WITHDRAW_ACTIVE' => "Einzahlungen vom WDS66-Portal aktiviert?", - 'WERNIS_ADMIN_PAYOUT_FACTOR' => "Umrechnungsfaktor von {?POINTS?} in Wernis für Auszahlungen", - 'WERNIS_ADMIN_WITHDRAW_FACTOR' => "Umrechnungsfaktor von Wernis in {?POINTS?} für Einzahlungen", - 'WERNIS_ADMIN_PAYOUT_FEE_PERCENT' => "Prozentuale Betreibergebühr für Auszahlungen", - 'WERNIS_ADMIN_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergebühr für Einzahlungen", - 'WERNIS_ADMIN_PAYOUT_FEE_FIX' => "Fixe Betreibergebühr für Auszahlungen", - 'WERNIS_ADMIN_WITHDRAW_FEE_FIX' => "Fixe Betreibergebühr für Einzahlungen", + // Admin messages + 'ADMIN_WERNIS_CONFIG_TITLE' => "Einstellungen zum WDS66-Hauptaccount:", + 'ADMIN_WERNIS_MIN_PAYOUT' => "Minimumguthaben für Auszahlungen.", + 'ADMIN_WERNIS_MIN_WITHDRAW' => "Minimumguthaben für Einzahlungen.", + 'ADMIN_WERNIS_API_ID' => "WDS66-API-Id (api_id=x)", + 'ADMIN_WERNIS_API_MD5' => "WDS66-API-Key (api_md5=xxxxx; 32-stellig)", + 'ADMIN_WERNIS_API_URL' => "Basis-URL der API-Skripte", + 'ADMIN_WERNIS_REFID' => "Ihre Referal-Id bei WDS66-Portal (= Ihr Username!)", + 'ADMIN_WERNIS_WPASS' => "Wernis-Passwort (nicht Account-Passwort!)", + 'ADMIN_WERNIS_CONFIG_NOTE' => "[Hier] können Sie schon für einmalig kostenlos 25.000 Abfragen ein API-Account beantragen (dazu ist ein kostenloses Wernis-Account dennoch nötig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von und nach WDS66-Wernis-Portal benötigt. Die Betreibergebühren und Umrechnungsfaktoren sind für den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese müssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen.", + 'ADMIN_WERNIS_NO_TRANSFERS' => "Derzeit keine Wernis transferiert.", + 'ADMIN_WERNIS_WDS66_ACCOUNT' => "Account bei WDS66-Portal", + 'ADMIN_WERNIS_TRANSFERED' => "Wernis transferiert", + 'ADMIN_WERNIS_TIMESTAMP' => "Zeitpunkt Überweisung", + 'ADMIN_WERNIS_TYPE' => "Überweisungsrichtung", + 'ADMIN_WERNIS_API_MESSAGE' => "Nachricht von WDS66-API", + 'ADMIN_WERNIS_API_STATUS' => "Status von WDS66-API", + 'ADMIN_WERNIS_PAYOUT_ACTIVE' => "Auszahlungen zum WDS66-Portal aktiviert?", + 'ADMIN_WERNIS_WITHDRAW_ACTIVE' => "Einzahlungen vom WDS66-Portal aktiviert?", + 'ADMIN_WERNIS_PAYOUT_FACTOR' => "Umrechnungsfaktor von {?POINTS?} in Wernis für Auszahlungen", + 'ADMIN_WERNIS_WITHDRAW_FACTOR' => "Umrechnungsfaktor von Wernis in {?POINTS?} für Einzahlungen", + 'ADMIN_WERNIS_PAYOUT_FEE_PERCENT' => "Prozentuale Betreibergebühr für Auszahlungen", + 'ADMIN_WERNIS_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergebühr für Einzahlungen", + 'ADMIN_WERNIS_PAYOUT_FEE_FIX' => "Fixe Betreibergebühr für Auszahlungen", + 'ADMIN_WERNIS_WITHDRAW_FEE_FIX' => "Fixe Betreibergebühr für Einzahlungen", + 'ADMIN_LIST_WERNIS_FOOTER' => "Hier soll ein Hinweis hinkommen.", -// API messages + // API messages 'WERNIS_API_REQUEST_DATA_INVALID' => "Interner Fehler: Abfragedaten sind defekt.", 'WERNIS_API_REQUEST_DATA_MISSING' => "Interner Fehler: Abfragedaten sind nicht komplett.", 'WERNIS_API_REQUEST_ERROR' => "Abfragefehler: %s", @@ -96,44 +97,44 @@ addMessages(array( 'WERNIS_API_PURPOSE_WITHDRAW' => "Einzahlung auf {?MAIN_TITLE?} ({?URL?}), id: %s", 'WERNIS_API_PURPOSE_PAYOUT' => "Auszahlung von {?MAIN_TITLE?} ({?URL?}), id: %s", -// Error messages + // Error messages 'WERNIS_ERROR_STATUS' => "Fehler-Status %s erhalten.", 'WERNIS_UNKNOWN_ERROR' => "Unbekannter Fehler aufgetreten.", -// Member messages + // Member messages 'MEMBER_WERNIS_MODE_CHOOSE' => "Möchten Sie Wernis zu Ihrem WDS66-Hauptaccount ausbezahlt bekommen oder Wernis hier einzahlen?", 'MEMBER_WERNIS_MODE_CHOOSE2' => "Hier klicken um neue Überweisung zu starten...", - 'WERNIS_MEMBER_NO_ACCOUNT' => "Noch kein WDS66-Account? Hier entlang.", - 'WERNIS_MEMBER_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten müssen.", - 'WERNIS_MEMBER_MIN_PAYOUT' => "Sie haben nicht genügend Wernis zum Auszahlen! Mindestens: %s, Ihr Guthaben: %s Wernis.", - 'WERNIS_MEMBER_WITHDRAW_TITLE' => "Wernis bei {?MAIN_TITLE?} einzahlen:", - 'WERNIS_MEMBER_WITHDRAW_POINTS_ACCOUNT' => "Wernis hier im Account:", - 'WERNIS_MEMBER_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Wernis-Guthaben:", - 'WERNIS_MEMBER_WITHDRAW_SUBMIT' => "Wernis jetzt einzahlen", - 'WERNIS_MEMBER_WITHDRAW_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Beträge eingeben! Ihr WDS66-Konto sollte ausreichend Deckung aufweisen.", - 'WERNIS_MEMBER_PAYOUT_TITLE' => "Wernis auf Ihr WDS66-Hauptaccount auszahlen", - 'WERNIS_MEMBER_PAYOUT_POINTS' => "Auszahlfähiges Wernis-Guthaben", - 'WERNIS_MEMBER_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Wernis-Guthaben", - 'WERNIS_MEMBER_PAYOUT_SUBMIT' => "Auszahlung durchführen", - 'WERNIS_MEMBER_PAYOUT_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Beträge eingeben! Überprüfen Sie vor dem Absenden Ihren WDS66-Usernamen.", - 'WERNIS_MEMBER_WDS66_ID' => "Username bei WDS66-Portal: [Vergessen?]", - 'WERNIS_MEMBER_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [Vergessen?]", - 'WERNIS_MEMBER_WDS66_AMOUNT' => "Zu überweisenden Betrag eingeben:", - 'WERNIS_MEMBER_MODE_INVALID' => "Ungültiger Modus %s erkannt! Bitte links im Menü fortfahren.", - 'WERNIS_MEMBER_EMPTY_USERNAME' => "Sie haben Ihren WDS66-Usernamen nicht eingegeben.", - 'WERNIS_MEMBER_EMPTY_PASSWORD' => "Sieh haben kein Wernis-Passwort eingegeben.", - 'WERNIS_MEMBER_EMPTY_AMOUNT' => "Sie haben keine zu überweisende Betrag angegeben.", - 'WERNIS_MEMBER_INVALID_USERNAME' => "Bitte nur Zahlen für den WDS66-Usernamen eingeben.", - 'WERNIS_MEMBER_INVALID_AMOUNT' => "Bitte nur Zahlen für den zu überweisenden Betrag eingeben.", - 'WERNIS_MEMBER_WITHDRAW_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_withdraw%} Wernis für die Einzahlung an.", - 'WERNIS_MEMBER_PAYOUT_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_payout%} Wernis für die Auszahlung an.", - 'WERNIS_MEMBER_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", - 'WERNIS_MEMBER_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", - 'WERNIS_MEMBER_PAYOUT_DONE' => "Auszahlung auf WDS66-Hauptaccount erfolgreich abgeschlossen. :-)", - 'WERNIS_MEMBER_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Wernis auszahlen, da Sie nur %s übrig haben.", - 'WERNIS_MEMBER_STATUS' => "Überweisungsart", - 'WERNIS_MEMBER_PAYOUT_DISABLED' => "Auszahlung wurde administrativ deaktiviert.", - 'WERNIS_MEMBER_WITHDRAW_DISABLED' => "Einzahlung wurde administrativ deaktiviert.", + 'MEMBER_WERNIS_NO_ACCOUNT' => "Noch kein WDS66-Account? Hier entlang.", + 'MEMBER_WERNIS_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten müssen.", + 'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht genügend Wernis zum Auszahlen! Mindestens: %s, Ihr Guthaben: %s Wernis.", + 'MEMBER_WERNIS_WITHDRAW_TITLE' => "Wernis bei {?MAIN_TITLE?} einzahlen:", + 'MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT' => "Wernis hier im Account:", + 'MEMBER_WERNIS_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Wernis-Guthaben:", + 'MEMBER_WERNIS_WITHDRAW_SUBMIT' => "Wernis jetzt einzahlen", + 'MEMBER_WERNIS_WITHDRAW_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Beträge eingeben! Ihr WDS66-Konto sollte ausreichend Deckung aufweisen.", + 'MEMBER_WERNIS_PAYOUT_TITLE' => "Wernis auf Ihr WDS66-Hauptaccount auszahlen", + 'MEMBER_WERNIS_PAYOUT_POINTS' => "Auszahlfähiges Wernis-Guthaben", + 'MEMBER_WERNIS_PAYOUT_MIN_POINTS' => "Mindestens auszuzahlendes Wernis-Guthaben", + 'MEMBER_WERNIS_PAYOUT_SUBMIT' => "Auszahlung durchführen", + 'MEMBER_WERNIS_PAYOUT_NOTE' => "Ihr Wernis-Passwort wird bei {?MAIN_TITLE?} nicht gespeichert. Bitte bei Wernis-Betrag nur gerade Beträge eingeben! Überprüfen Sie vor dem Absenden Ihren WDS66-Usernamen.", + 'MEMBER_WERNIS_WDS66_ID' => "Username bei WDS66-Portal: [Vergessen?]", + 'MEMBER_WERNIS_WDS66_PASSWORD' => "Wernis-Passwort (nicht Accountpasswort!): [Vergessen?]", + 'MEMBER_WERNIS_WDS66_AMOUNT' => "Zu überweisenden Betrag eingeben:", + 'MEMBER_WERNIS_MODE_INVALID' => "Ungültiger Modus %s erkannt! Bitte links im Menü fortfahren.", + 'MEMBER_WERNIS_EMPTY_USERNAME' => "Sie haben Ihren WDS66-Usernamen nicht eingegeben.", + 'MEMBER_WERNIS_EMPTY_PASSWORD' => "Sieh haben kein Wernis-Passwort eingegeben.", + 'MEMBER_WERNIS_EMPTY_AMOUNT' => "Sie haben keine zu überweisende Betrag angegeben.", + 'MEMBER_WERNIS_INVALID_USERNAME' => "Bitte nur Zahlen für den WDS66-Usernamen eingeben.", + 'MEMBER_WERNIS_INVALID_AMOUNT' => "Bitte nur Zahlen für den zu überweisenden Betrag eingeben.", + 'MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_withdraw%} Wernis für die Einzahlung an.", + 'MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN' => "Bitte geben Sie mindestens {%config,translateComma=wernis_min_payout%} Wernis für die Auszahlung an.", + 'MEMBER_WERNIS_WITHDRAW_FAILED' => "Die Einzahlung hat nicht geklappt! Rückmeldung für den Support: %s.", + 'MEMBER_WERNIS_WITHDRAW_DONE' => "Einzahlung auf Ihr {?MAIN_TITLE?} Konto erfolgreich abgeschlossen. :-)", + 'MEMBER_WERNIS_PAYOUT_DONE' => "Auszahlung auf WDS66-Hauptaccount erfolgreich abgeschlossen. :-)", + 'MEMBER_WERNIS_PAYOUT_POINTS_DEPLETED' => "Sie können nicht %s Wernis auszahlen, da Sie nur %s übrig haben.", + 'MEMBER_WERNIS_STATUS' => "Überweisungsart", + 'MEMBER_WERNIS_PAYOUT_DISABLED' => "Auszahlung wurde administrativ deaktiviert.", + 'MEMBER_WERNIS_WITHDRAW_DISABLED' => "Einzahlung wurde administrativ deaktiviert.", )); // [EOF] diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 74e1686bcb..cc09410198 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -201,7 +201,7 @@ LIMIT 1", // Output row $OUT .= " -  ".$rows['rank'].". + ".$rows['rank'].". ".$rows['userid']." ".$rows['points']." \n"; diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index a804da7563..49e5a580ee 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -285,16 +285,16 @@ LIMIT 1", if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---'; // Add row $OUT .= " -   ".($idx+1).". + ".($idx+1).". "; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= $DATA['userid'][$idx]; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= " "; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= $DATA['ref'][$idx]; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= " \n"; $SW = 3 - $SW; @@ -685,21 +685,21 @@ function addReferalRallyeWinners ($rallye, $default=0) { // Add row $add = ''; $OUT .= " -   ".($idx+1).". + ".($idx+1).". "; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= $DATA['userid'][$idx]; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= " "; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= $DATA['ref'][$idx]; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= " "; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= $DATA['infos'][$idx]; - if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ''; $OUT .= " \n"; $SW = 3 - $SW; diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 06abee9cc5..e1e4ab8ae0 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -87,7 +87,7 @@ function registerGenerateCategoryTable ($mode, $return=false) { if (SQL_NUMROWS($result) > 0) { // List alle visible modules (or all to the admin) $SW = 2; - $OUT .= "\n"; + $OUT .= '
'; while ($content = SQL_FETCHARRAY($result)) { // Prepare array for the template $content = array( @@ -109,7 +109,7 @@ function registerGenerateCategoryTable ($mode, $return=false) { $OUT .= loadTemplate('guest_cat_row', true, $content); $SW = 3 - $SW; } - $OUT .= "
\n"; + $OUT .= ''; // Free memory SQL_FREERESULT($result); @@ -146,7 +146,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) { while ($row = SQL_FETCHARRAY($result)) { // Must the user fill out this element? $value = ''; - if ($row['field_required'] == 'Y') $value = " (*)"; + if ($row['field_required'] == 'Y') $value = '(*)'; // Add it $content['must_fillout_'.strtolower($row['field_name']).''] = $value; diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index 99e88565e9..f6b525ee0e 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -294,7 +294,7 @@ ORDER BY `sort`", $content = merge_array($content, $content2); // Check if current selected menu is matching the loaded one - if ($current == $content['sub_what']) $content['sub_title'] = "".$content['sub_title'].""; + if ($current == $content['sub_what']) $content['sub_title'] = '' . $content['sub_title'] . ''; // Prepare data for the sub template $content = array( diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 0ef2a4c903..f2a659a14d 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -133,9 +133,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { } // Add page navigation -function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) { +function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) { // @TODO These two constants are no longer used, maybe we reactivate this code? - //if ($show_form === true) { + //if ($showForm === true) { // // Load form for changing number of lines // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true)); // define('__FORM_FOOTER', ' '); @@ -146,7 +146,7 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) //} $OUT = ''; - for ($page = 1; $page <= $PAGES; $page++) { + for ($page = 1; $page <= $pages; $page++) { if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) { $OUT .= '-'; } else { @@ -172,7 +172,7 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) $OUT .= ''; } - if ($page < $PAGES) $OUT .= ' | '; + if ($page < $pages) $OUT .= ' | '; } // END - for // Remember the list diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index cd753943fb..3e51681a46 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -347,7 +347,6 @@ ORDER BY // Do we have entries? if (SQL_NUMROWS($result_main) > 0) { - $OUT = '
 
'; $OUT .= '
    '; // @TODO Rewrite this to $content = SQL_FETCHARRAY() while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) { @@ -474,8 +473,6 @@ ORDER BY $OUT .= '
'; } // END - if - - $OUT .= '
  •  
    • '; } // END - if } // END - while diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index f2db40320b..70448b0315 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -183,7 +183,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1", default: // Unexpected action logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok'))); - loadTemplate('admin_menu_unknown_okay', false, postRequestParameter('ok')); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok'))); break; } } else { diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index 41ab4b8dfe..f416374aee 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -39,22 +39,32 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); // Do we want to save changes? if (isFormSent()) { + // Begin counting + $cnt = 0; + + // Update all entries foreach (postRequestParameter('sel') as $id => $value) { - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_must_register` SET field_required='%s' WHERE `id`=%s AND field_required != '%s' LIMIT 1", - array($value, bigintval($id), $value),__FILE__, __LINE__); - } - loadTemplate('admin_settings_saved', false, getMessage('REGISTER_ADMIN_CHANGES_SAVED')); -} + // Update database + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_must_register` SET `field_required`='%s' WHERE `id`=%s AND `field_required` != '%s' LIMIT 1", + array($value, bigintval($id), $value),__FILE__, __LINE__); + + // Get affected rows + $cnt += SQL_AFFECTEDROWS(); + } // END - foreach + + // Output message for updated entries + loadTemplate('admin_settings_saved', false, getMaskedMessage('REGISTER_ADMIN_CHANGES_SAVED', $cnt)); +} // END - if // List all register values -$result = SQL_QUERY("SELECT id, field_name, field_required FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC", __FILE__, __LINE__); +$result = SQL_QUERY("SELECT `id`, `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC", __FILE__, __LINE__); $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Get language string @@ -66,16 +76,16 @@ while ($content = SQL_FETCHARRAY($result)) { // @TODO Move this HTML code into a template $OUT .= " - ".$content['id']." -   ".$content['field_name']." - - ".$content['selection']." - + ".$content['id']." + ".$content['field_name']." + + ".$content['selection']." + \n"; // Switch color $SW = 3 - $SW; -} +} // END - while // Free memory SQL_FREERESULT($result); diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index 85998ecb3c..b631bf8781 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -179,7 +179,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem default: // Unexpected action logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok'))); - loadTemplate('admin_menu_unknown_okay', false, postRequestParameter('ok')); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok'))); break; } // END - switch } elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) { diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 581855e47a..e4fcf199f3 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -39,7 +39,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -94,9 +94,9 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC", $WIN1 = ''; $WIN2 = ''; if ($cnt <= getConfig('bonus_ranks')) { // Maybe he can win his active bonus? - $WIN1 = ""; - $WIN2 = ""; - } + $WIN1 = ''; + $WIN2 = ''; + } // END - if // Prepare content $content['userid'] = generateUserProfileLink($content['userid']); diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php index 2c868160f7..65b76a77cb 100644 --- a/inc/modules/admin/what-list_primera.php +++ b/inc/modules/admin/what-list_primera.php @@ -74,7 +74,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_primera_main', false, $OUT); } else { // Nothing to display! - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_ADMIN_NO_TRANSFERS')); + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PRIMERA_NO_TRANSFERS')); } // Free the result diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php index e2829bb93c..35bcec8802 100644 --- a/inc/modules/admin/what-list_wernis.php +++ b/inc/modules/admin/what-list_wernis.php @@ -80,7 +80,7 @@ if (SQL_NUMROWS($result) > 0) { loadTemplate('admin_list_wernis_main', false, $OUT); } else { // Nothing to display! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_ADMIN_NO_TRANSFERS')); + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WERNIS_NO_TRANSFERS')); } // Free the result diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index 0370abeeb8..f59be36a33 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -199,8 +199,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1", array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__); break; + + default: // Unexpected action + logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok'))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok'))); + break; } // END - switch - break; } // END - foreach // Load template diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index bb5750c03e..0ee58bbd1e 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -106,8 +106,7 @@ $content['message'] = ''; if (!empty($errorCode)) { // @TODO Move this HTML code into a template $message = " -   - + "; // Do we have a userid set? @@ -122,7 +121,6 @@ if (!empty($errorCode)) { // Continue with HTML $message .= " -   \n"; $content['message'] = $message; } // END - if diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 8967f7561e..1ba7228f04 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -626,12 +626,13 @@ LIMIT 1", } // END - if } // END - foreach + // No content is default + $content['zip_content'] = ''; + if (isPostRequestParameterSet('zip')) { // Output entered ZIP code $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip')); - } else { - $content['zip_content'] = ' '; - } + } // END - if // HTML extension if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) { diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index 505bd1e70b..8bfda643bb 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -56,7 +56,7 @@ if ((!isExtensionActive('primera')) && (!isAdmin())) { // Check if the admin has entered the data if ((getConfig('primera_api_name') == '') || (getConfig('primera_api_md5') == '')) { // Something important is missing... - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_API_DATA_MISSING')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_API_DATA_MISSING')); return; } // END - if @@ -118,7 +118,7 @@ if (getRequestParameter('mode') == 'pay') { // Is this enougth for a payout? if ($points < getConfig('primera_min_payout')) { // No, then abort here - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_MIN_PAYOUT_PAYOUT')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_MIN_PAYOUT_PAYOUT')); return; } @@ -126,7 +126,7 @@ if (getRequestParameter('mode') == 'pay') { $content['points'] = $points; } else { // Invalid mode! - loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestParameter('mode'))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode'))); return; } @@ -138,22 +138,22 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { // Is the user id and password set? if (!isPostRequestParameterSet(('primera_nickname'))) { // Nothing entered in Primus nickname - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_USERNAME')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_USERNAME')); } elseif (!isPostRequestParameterSet(('primera_password'))) { // Nothing entered in Primera password - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_PASSWORD')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_PASSWORD')); } elseif (!isPostRequestParameterSet(('amount'))) { // Nothing entered in amount - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_EMPTY_AMOUNT')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_EMPTY_AMOUNT')); } elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) { // Only numbers in amount! - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_INVALID_AMOUNT')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_INVALID_AMOUNT')); } elseif (postRequestParameter('amount') < getConfig('primera_min_payout')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_AMOUNT_SMALLER_MIN')); } elseif (postRequestParameter('amount') > $points) { // Not enougth points left! - loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); + loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_PRIMERA_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); } else { // All is fine here so do the payout $success = executePrimeraPayout(postRequestParameter('primera_nickname'), md5(postRequestParameter('primera_password')), postRequestParameter('amount')); @@ -175,21 +175,21 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(postRequestParameter('primera_nickname'), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('PRIMERA_MEMBER_PAYOUT_DONE')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_PRIMERA_PAYOUT_DONE')); return; } elseif ((GET_PRIMERA_ERROR_CODE() == 'user_failed') || (GET_PRIMERA_ERROR_CODE() == 'own_failed') || (GET_PRIMERA_ERROR_CODE() == 'amount_failed') || (GET_PRIMERA_ERROR_CODE() == 'api_amount_failed')) { // Wrong login data loadTemplate('admin_settings_saved', false, GET_PRIMERA_ERROR_MESSAGE()); } else { // Something went wrong - loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE())); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_PAYOUT_FAILED', GET_PRIMERA_ERROR_MESSAGE())); } } break; default: // Invalid mode! logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode'))); - loadTemplate('admin_settings_saved', false, getMaskedMessage('PRIMERA_MEMBER_MODE_INVALID', getRequestParameter('mode'))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_PRIMERA_MODE_INVALID', getRequestParameter('mode'))); return; } } // END - if diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index 5eb2520c19..6517d9cd85 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -55,7 +55,7 @@ if ((!isExtensionActive('wernis')) && (!isAdmin())) { // Check if the admin has entered the data if ((getConfig('wernis_api_id') == '') || (getConfig('wernis_api_md5') == '')) { // Something important is missing... - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_API_DATA_MISSING')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_API_DATA_MISSING')); return; } // END - if @@ -99,8 +99,8 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo SQL_FREERESULT($result); } else { // Default links are not active! - $content['payout_link'] = '{--WERNIS_MEMBER_PAYOUT_DISABLED--}'; - $content['withdraw_link'] = '{--WERNIS_MEMBER_WITHDRAW_DISABLED--}'; + $content['payout_link'] = '{--MEMBER_WERNIS_PAYOUT_DISABLED--}'; + $content['withdraw_link'] = '{--MEMBER_WERNIS_WITHDRAW_DISABLED--}'; // Is the payout mode active? if (getConfig('wernis_payout_active') == 'Y') { @@ -131,7 +131,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo if ($points < getConfig('wernis_min_payout')) { // No, then abort here loadTemplate('admin_settings_saved', false, sprintf( - getMessage('WERNIS_MEMBER_MIN_PAYOUT'), + getMessage('MEMBER_WERNIS_MIN_PAYOUT'), translateComma(getConfig('wernis_min_payout')), translateComma($points) )); @@ -162,7 +162,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo $content['wernis_userid'] = getUserData('wernis_userid'); } else { // Invalid mode! - loadTemplate('admin_settings_saved', false, getMaskedMessage('WERNIS_MEMBER_MODE_INVALID', getRequestParameter('mode'))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode'))); return; } @@ -171,26 +171,26 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { // Is the user id and password set? if (!isPostRequestParameterSet(('wernis_userid'))) { // Nothing entered in WDS66 user id - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_EMPTY_USERNAME')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_USERNAME')); } elseif (!isPostRequestParameterSet(('wds66_password'))) { // Nothing entered in WDS66 password - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_EMPTY_PASSWORD')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_PASSWORD')); } elseif (!isPostRequestParameterSet(('amount'))) { // Nothing entered in amount - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_EMPTY_AMOUNT')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_EMPTY_AMOUNT')); } elseif (postRequestParameter('wernis_userid') != bigintval(postRequestParameter('wernis_userid'))) { // Only numbers in account id! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_INVALID_USERNAME')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_INVALID_USERNAME')); } elseif (postRequestParameter('amount') != bigintval(postRequestParameter('amount'))) { // Only numbers in amount! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_INVALID_AMOUNT')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_INVALID_AMOUNT')); } else { // Check input data depending on the mode and execute the requested mode switch (getRequestParameter('mode')) { case 'withdraw': // Widthdraws WDS66 -> This exchange if (postRequestParameter('amount') < getConfig('wernis_min_withdraw')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_WITHDRAW_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_WITHDRAW_AMOUNT_SMALLER_MIN')); } else { // All is fine here so do the withdraw $success = WERNIS_EXECUTE_WITHDRAW(postRequestParameter('wernis_userid'), md5(postRequestParameter('wds66_password')), postRequestParameter('amount')); @@ -203,14 +203,14 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(bigintval(postRequestParameter('wernis_userid')), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_WITHDRAW_DONE')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_WITHDRAW_DONE')); return; } elseif ((GET_WERNIS_ERROR_CODE() == 'user_failed') || (GET_WERNIS_ERROR_CODE() == 'own_failed') || (GET_WERNIS_ERROR_CODE() == 'amount_failed')) { // Wrong login data loadTemplate('admin_settings_saved', false, GET_WERNIS_ERROR_MESSAGE()); } else { // Something went wrong - loadTemplate('admin_settings_saved', false, getMaskedMessage('WERNIS_MEMBER_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE())); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE())); } } break; @@ -218,10 +218,10 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { case 'payout': // Payout this exchange -> WDS66 if (postRequestParameter('amount') < getConfig('wernis_min_payout')) { // Not enougth entered! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_PAYOUT_AMOUNT_SMALLER_MIN')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_PAYOUT_AMOUNT_SMALLER_MIN')); } elseif (postRequestParameter('amount') > $points) { // Not enougth points left! - loadTemplate('admin_settings_saved', false, sprintf(getMessage('WERNIS_MEMBER_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); + loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_WERNIS_PAYOUT_POINTS_DEPLETED'), bigintval(postRequestParameter('amount')), bigintval($points))); } else { // All is fine here so do the withdraw $success = WERNIS_EXECUTE_PAYOUT(postRequestParameter('wernis_userid'), postRequestParameter('amount')); @@ -234,21 +234,21 @@ if ((isFormSent()) && (isGetRequestParameterSet('mode'))) { array(bigintval(postRequestParameter('wernis_userid')), getMemberId()), __FILE__, __LINE__); // All done! - loadTemplate('admin_settings_saved', false, getMessage('WERNIS_MEMBER_PAYOUT_DONE')); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_WERNIS_PAYOUT_DONE')); return; } elseif ((GET_WERNIS_ERROR_CODE() == 'user_failed') || (GET_WERNIS_ERROR_CODE() == 'own_failed') || (GET_WERNIS_ERROR_CODE() == 'amount_failed') || (GET_WERNIS_ERROR_CODE() == 'api_amount_failed')) { // Wrong login data loadTemplate('admin_settings_saved', false, GET_WERNIS_ERROR_MESSAGE()); } else { // Something went wrong - loadTemplate('admin_settings_saved', false, getMaskedMessage('WERNIS_MEMBER_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE())); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_WITHDRAW_FAILED', GET_WERNIS_ERROR_MESSAGE())); } } break; default: // Invalid mode! logDebugMessage(__FILE__, __LINE__, sprintf("Invalid mode %s detected.", getRequestParameter('mode'))); - loadTemplate('admin_settings_saved', false, getMaskedMessage('WERNIS_MEMBER_MODE_INVALID', getRequestParameter('mode'))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_WERNIS_MODE_INVALID', getRequestParameter('mode'))); return; } } diff --git a/templates/de/html/admin/admin_add_banner.tpl b/templates/de/html/admin/admin_add_banner.tpl index 5d573a3ca4..4d78d2aa2c 100644 --- a/templates/de/html/admin/admin_add_banner.tpl +++ b/templates/de/html/admin/admin_add_banner.tpl @@ -2,47 +2,36 @@
    - - - - - - - - - - - - - - - - - - + + - - - + + - + + - +
    - {--ADMIN_ADD_BANNER--}
     
    {--ADMIN_ENTER_BANNER_URL--}:  + + {--ADMIN_ADD_BANNER--}
     
    {--ADMIN_ENTER_ALTERNATE_TEXT--}: 
     {--ADMIN_ENTER_BANNER_URL--}: + +
    {--ADMIN_SELECT_BANNER_ACTIVE--} {--ADMIN_ENTER_ALTERNATE_TEXT--}: + +
     {--ADMIN_SELECT_BANNER_ACTIVE--} + +
    - + + +
    diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index 89b12fd821..e90bd8bf89 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -2,40 +2,22 @@
    - - - - - - - - - - + - - - - - + - - - - - - - - + - diff --git a/templates/de/html/admin/admin_add_rallye_prices.tpl b/templates/de/html/admin/admin_add_rallye_prices.tpl index 9a9a0629f5..b872162f62 100644 --- a/templates/de/html/admin/admin_add_rallye_prices.tpl +++ b/templates/de/html/admin/admin_add_rallye_prices.tpl @@ -1,50 +1,34 @@
    -
     
    {--ADMIN_ADD_POINTS_TO_ALL--}:
     
     {--ADMIN_ADD_POINTS_TO_ALL--}:
    {--ENTER_POINTS_ADD--}: 
      + +
    {--ENTER_ADD_REASON--}: 
     
      + +
    +
    +
    - - - - - - - - - - - - - + + - - - - - - - - - - + - + + - +
    + {--RALLYE_CONFIG_PRICES_1--}$content{--RALLYE_CONFIG_PRICES_2--}:
     
    {--RALLYE_PRICE_LEVEL--}: 
     
     {--RALLYE_PRICE_LEVEL--}: + +
    {--RALLYE_PRICE_POINTS--}: 
     
    {--RALLYE_PRICE_INFOS--}:  + +
     {--RALLYE_PRICE_INFOS--}: + +
    - + + +
    diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index 741a56edfb..4728050631 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -1,70 +1,49 @@ +
    - +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      + {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}  
      + {--ADMIN_SPONSOR_COMPANY_NOTE--}  
     
      - {--SPONSOR_ENTER_COMPANY_TITLE--}:  + + {--SPONSOR_ENTER_COMPANY_TITLE--}:   +  
     
      - {--SPONSOR_ENTER_COMPANY_POSITION--}:  + {--SPONSOR_ENTER_COMPANY_POSITION--}:    
     
      - {--SPONSOR_ENTER_TAX_IDENT--}:  + + {--SPONSOR_ENTER_TAX_IDENT--}:   +  
     
      + {--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}  
     
      - {--GUEST_GENDER--}:  + {--GUEST_GENDER--}:    
     
      - {--GUEST_SURNAME--}:  + {--GUEST_SURNAME--}:    
     
      - {--GUEST_FAMILY--}:  + + {--GUEST_FAMILY--}:   +  
     
      + {--ADMIN_SPONSOR_ENTER_CONTACT_DATA--}  
     
      - {--SPONSOR_ENTER_STREET_NR1--}:  + {--SPONSOR_ENTER_STREET_NR1--}:    
     
      - {--SPONSOR_ENTER_STREET_NR2--}:  + {--SPONSOR_ENTER_STREET_NR2--}:    
     
      - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:  + {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:   -  
     
      - {--SPONSOR_ENTER_PHONE--}:  + {--SPONSOR_ENTER_PHONE--}:    
     
      - {--SPONSOR_ENTER_FAX--}:  + {--SPONSOR_ENTER_FAX--}:    
     
      - {--SPONSOR_ENTER_CELL--}:  + {--SPONSOR_ENTER_CELL--}:    
     
      - {--SPONSOR_ENTER_EMAIL--}:  + {--SPONSOR_ENTER_EMAIL--}:    
     
      - {--SPONSOR_ENTER_URL--}:  + + {--SPONSOR_ENTER_URL--}:   +  
     
      + {--ADMIN_SPONSOR_ENTER_PASSWORDS--}  
     
      - {--SPONSOR_ENTER_PASSWORDS--}:  + + {--SPONSOR_ENTER_PASSWORDS--}:   +  
     
      + {--ADMIN_SPONSOR_WARNINGS_POINTS--}  
     
      - {--SPONSOR_RECEIVE_WARNINGS--}:  + {--SPONSOR_RECEIVE_WARNINGS--}:    
     
      - {--SPONSOR_WARNING_INTERVAL--}:  + {--SPONSOR_WARNING_INTERVAL--}:    
     
      - {--SPONSOR_ENTER_POINTS--}:  + + {--SPONSOR_ENTER_POINTS--}:   +  
     
      +  
    +
    diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl index 14b9ed81ba..2b3d9cd5cc 100644 --- a/templates/de/html/admin/admin_add_sponsor_already.tpl +++ b/templates/de/html/admin/admin_add_sponsor_already.tpl @@ -1,3 +1,4 @@ +
    @@ -5,13 +6,12 @@ {--ADMIN_SPONSOR_REALLY_ADD_SPONSOR--} - - -
     
    - Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse $content[email]. Wollen Sie ihn dennoch hinzufügen? + + Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse $content[email]. + Wollen Sie ihn dennoch hinzufügen?
     
    $content[hidden] @@ -20,3 +20,4 @@
    +
    diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 72c5c4cddb..64b9d1a787 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -1,44 +1,36 @@ +
    - - - - - + + - - - - + + - - - - + + - - - - + + - -
    + {--ADMIN_ADD_SPONSOR_PAYTYPE_TITLE--}:
     
    {--SPONSOR_PAYTYPE_NAME--}:
    {--SPONSOR_PAYTYPE_NAME_HINT--}
    		 {--SPONSOR_PAYTYPE_NAME--}:
    {--SPONSOR_PAYTYPE_NAME_HINT--}
     
    {--SPONSOR_PAYTYPE_RATE--}:
    {--SPONSOR_PAYTYPE_RATE_HINT--}
    		 {--SPONSOR_PAYTYPE_RATE--}:
    {--SPONSOR_PAYTYPE_RATE_HINT--}
     
    {--SPONSOR_PAYTYPE_MIN_COUNT--}: {--SPONSOR_PAYTYPE_MIN_COUNT--}:
     
    {--SPONSOR_PAYTYPE_CURRENCY--}: {--SPONSOR_PAYTYPE_CURRENCY--}:
     
    +
    -
    +
    {--SPONSOR_ADD_PAYTYPES_NOTES--}:

    diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index c510d51e99..4c70faf7d2 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -1,12 +1,13 @@ +
    - - + + - @@ -20,3 +21,4 @@
    {--ADMINS_ADMIN_ID--}:$content[admin]{--ADMINS_ADMIN_ID--}:$content[admin]
    + {--ADMINS_ENTER_CONTACT_TEXT--}:
    +
    diff --git a/templates/de/html/admin/admin_admins_contct_select.tpl b/templates/de/html/admin/admin_admins_contct_select.tpl index 24654d4753..313367d4f5 100644 --- a/templates/de/html/admin/admin_admins_contct_select.tpl +++ b/templates/de/html/admin/admin_admins_contct_select.tpl @@ -1,16 +1,12 @@ - + {--ADMINS_SELECT_CONTACT_TYPE--} - -   - {--ADMINS_CONTACT_TYPE_MAIL--} -   {--ADMINS_CONTACT_TYPE_MSG--} diff --git a/templates/de/html/admin/admin_amenu_delete_row.tpl b/templates/de/html/admin/admin_amenu_delete_row.tpl index e2acf21244..afd28258c7 100644 --- a/templates/de/html/admin/admin_amenu_delete_row.tpl +++ b/templates/de/html/admin/admin_amenu_delete_row.tpl @@ -1,8 +1,8 @@ - - $content[cnt].{--ENTRY_DELETE--}:   + + $content[cnt]. {--ENTRY_DELETE--}: - + $content[menu] diff --git a/templates/de/html/admin/admin_amenu_edit_row.tpl b/templates/de/html/admin/admin_amenu_edit_row.tpl index 08de9ac89f..2ff6ea8aea 100644 --- a/templates/de/html/admin/admin_amenu_edit_row.tpl +++ b/templates/de/html/admin/admin_amenu_edit_row.tpl @@ -1,49 +1,37 @@ - + + $content[cnt]. {--ENTRY_MODIFY--}: + - $content[cnt]. - {--ENTRY_MODIFY--}: + + {--EDIT_ACTION--}: + + + $content[action] + - + + {--EDIT_WHAT--}: + + + $content[what] + - - {--EDIT_ACTION--}: - - $content[action] + + {--EDIT_TITLE--}: + + + + - + + {--EDIT_DESCR--}: + + + + - - - {--EDIT_WHAT--}: - - $content[what] - - - - - - - {--EDIT_TITLE--}: - - - - - - - - {--EDIT_DESCR--}: - - - -   - \ No newline at end of file diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index bea4aac0f7..cf91ae5ec7 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -7,26 +7,19 @@ -   - - - + {--ADMIN_SELECT_MENU_TYPE--}: - + - {--ADMIN_MENU_NEW--} + {--ADMIN_MENU_NEW--} -   - + - {--ADMIN_MENU_OLD--} - - -   + {--ADMIN_MENU_OLD--} diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index 1c1b27a736..1f2d2cc97c 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -2,180 +2,105 @@
    - - - - - - - - - - - - - - - - - - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + - diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 369d89bb23..ab849346b4 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -2,61 +2,44 @@
    + {--ADMIN_AUTOPURGE_CONFIGURATION--}
    + {--ADMIN_AUTOPURGE_INACTIVE_TITLE--}
     
    {--ADMIN_AUTOPURGE_INACTIVE--}  $content[ap_inactive_selection]
     
    {--ADMIN_AUTOPURGE_INACTIVE_SINCE--}:  $content[ap_in_since]
     
    {--ADMIN_AUTOPURGE_INACTIVE_TIME--}: $content[ap_in_time]
     {--ADMIN_AUTOPURGE_INACTIVE_TIME--}:$content[ap_in_time]
    + {--ADMIN_AUTOPURGE_UNCONFIRMED_TITLE--}
     
    {--ADMIN_AUTOPURGE_UNCONFIRMED--}  $content[ap_unconfirmed_selection]
     {--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}:$content[ap_un_time]
    {--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}: $content[ap_un_time]
     
    + {--ADMIN_AUTOPURGE_TASKS_TITLE--}
     
    {--ADMIN_AUTOPURGE_TASKS--}  $content[ap_tasks_selection]
     
    {--ADMIN_AUTOPURGE_TASKS_TIME--}: $content[ap_task_time]
     {--ADMIN_AUTOPURGE_TASKS_TIME--}:$content[ap_task_time]
    + {--ADMIN_AUTOPURGE_MAILID_TITLE--}
     
    {--ADMIN_OPTION_AUTOPURGE_ACTIVE--}:  {--YES--}:  {--NO--}: 
     
    {--ADMIN_OPTION_MAIL_LIFETIME--}:  $content[auto_purge]
    {--ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS--}: $content[ap_notify_del_mails]
     {--ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS--}:$content[ap_notify_del_mails]
    + {--ADMIN_AUTOPURGE_DEL_MAILS_TITLE--}
     
    {--ADMIN_AUTOPURGE_DEL_MAILS--}  $content[ap_del_mails_selection]
     
    {--ADMIN_AUTOPURGE_DEL_MAILS_TIME--}: $content[ap_del_mails_time]{--ADMIN_AUTOPURGE_DEL_MAILS_TIME--}:$content[ap_del_mails_time]
     
    + {--ADMIN_AUTOPURGE_NOTIFICATION_TITLE--}
     
    {--ADMIN_AUTOPURGE_NOTIFY_INACTIVE--}:  $content[ap_notify_inactive]
     
    {--ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED--}:  $content[ap_notify_unconfirmed]
     
    {--ADMIN_AUTOPURGE_NOTIFY_TASKS--}: $content[ap_notify_tasks]
     {--ADMIN_AUTOPURGE_NOTIFY_TASKS--}:$content[ap_notify_tasks]
    +
    - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index b9ae99a64f..b8943540f6 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -87,7 +87,6 @@ - - + - - - - - - - - - - - - - + diff --git a/templates/de/html/admin/admin_config_email_edit_row.tpl b/templates/de/html/admin/admin_config_email_edit_row.tpl index c251bb38ed..af555e401a 100644 --- a/templates/de/html/admin/admin_config_email_edit_row.tpl +++ b/templates/de/html/admin/admin_config_email_edit_row.tpl @@ -1,15 +1,9 @@ - - - - - - - - - - - + - - - - - - diff --git a/templates/de/html/admin/admin_config_home_main.tpl b/templates/de/html/admin/admin_config_home_main.tpl index dcc2a73ee0..e284e0198e 100644 --- a/templates/de/html/admin/admin_config_home_main.tpl +++ b/templates/de/html/admin/admin_config_home_main.tpl @@ -1,13 +1,17 @@ -
    -
    +
    {--ADMIN_CONFIG_HOME_TITLE--}
    -  · {--ADMIN_EDIT_HOME_TARGET--} + + · + {--ADMIN_EDIT_HOME_TARGET--} +
    -  · {--ADMIN_EDIT_HOME_SETTINGS--} + + · + {--ADMIN_EDIT_HOME_SETTINGS--} +
    -
    diff --git a/templates/de/html/admin/admin_config_newsletter.tpl b/templates/de/html/admin/admin_config_newsletter.tpl index 6d62c36b1d..667323ec70 100644 --- a/templates/de/html/admin/admin_config_newsletter.tpl +++ b/templates/de/html/admin/admin_config_newsletter.tpl @@ -1,18 +1,17 @@ +
    + {--ADMIN_CONFIG_BIRTHDAY_HEADER--}
     
    {--ADMIN_BIRTHDAY_POINTS--}: - ({--ADMIN_BIRTHDAY_POINTS_NOTE--})  + + {--ADMIN_BIRTHDAY_POINTS--}: + ({--ADMIN_BIRTHDAY_POINTS_NOTE--}) +
    ({?POINTS?})
     
     
    {--ADMIN_BIRTHDAY_ONLY_ACTIVE--} {--ADMIN_BIRTHDAY_ONLY_ACTIVE--} {--YES--}
    {--NO--}
     
    + {--ADMIN_SELECT_BIRTHDAY_MODE--}:
     
    - {--BIRTHDAY_MODE_DIRECT--} + + + {--BIRTHDAY_MODE_DIRECT--}   - {--BIRTHDAY_MODE_REF--} + + + {--BIRTHDAY_MODE_REF--}
     
    + {--ADMIN_BONUS_REF_BONUS--}:   ({?POINTS?}) diff --git a/templates/de/html/admin/admin_config_email_del_row.tpl b/templates/de/html/admin/admin_config_email_del_row.tpl index 3d3df8c235..87c0ce175e 100644 --- a/templates/de/html/admin/admin_config_email_del_row.tpl +++ b/templates/de/html/admin/admin_config_email_del_row.tpl @@ -1,22 +1,11 @@
      + {--MRECEIVE_ID--} $content[id]: +
    {--MRECEIVE_ID--} - $content[id]:
     
    $content[value] - ($content[comment])
     
      + $content[value] ($content[comment]) + +
     
    {--MRECEIVE_ID--} $content[id]:
     
    {--MREC_VALUE!}:  @@ -17,17 +11,8 @@
     
    {--MREC_COMMENT--}:  + {--MREC_COMMENT--}: 
     
     
    - - - - -
    + {--ADMIN_NEWSLETTER_SETTINGS--}
     
    +
    +
    diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index cfd62d79bf..9a664e73b2 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -2,44 +2,30 @@
    - - - - - - - - - - + + - - - + - - - - - - + - - - - diff --git a/templates/de/html/admin/admin_config_order_form.tpl b/templates/de/html/admin/admin_config_order_form.tpl index 0941769441..432955b714 100644 --- a/templates/de/html/admin/admin_config_order_form.tpl +++ b/templates/de/html/admin/admin_config_order_form.tpl @@ -2,70 +2,41 @@
    - {--NICKNAME_ADMIN_CONFIG_HEADER--}
     
    {--ADMIN_NICKNAME_MIN_LENGTH--}:  - + + {--NICKNAME_ADMIN_CONFIG_HEADER--}
     {--ADMIN_NICKNAME_MIN_LENGTH--}: + +
    {--ADMIN_NICKNAME_PATTERN--}:  + {--ADMIN_NICKNAME_PATTERN--}:
     
    {--ADMIN_NICKNAME_LANG_CHARS--}:  + {--ADMIN_NICKNAME_LANG_CHARS--}:
     
    +
    - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - +
      + {--ADMIN_ORDER_SETTINGS--}:  
     
      - {--ADMIN_ORDER_MAX_ORDER_SELECT--} 
     
      + {--ADMIN_ORDER_MAX_ORDER_SELECT--} +
     {--ADMIN_ORDER_MAX--}: {--ADMIN_ORDER_MAX--}:   {--ADMIN_ORDER_ORDER--}: {--ADMIN_ORDER_ORDER--}:   
     
    + {--ADMIN_ORDER_MISC_SETTINGS--}:
     
      + {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}:   - + +  
     
      -   + + +
    diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 25c64a8e10..18d76a7199 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -1,3 +1,4 @@ +
    @@ -217,10 +218,6 @@ - - - - @@ -253,3 +250,4 @@
    $content[profile_lock]
     
    {--ADMIN_OPTION_PROFILE_UPDATE--}: $content[profile_update]
    +
    diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index af4cc5a4cd..8c758fa8e0 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -3,17 +3,17 @@ - + - + - + - + - + - + + + - - diff --git a/templates/de/html/admin/admin_config_rewrite_rows.tpl b/templates/de/html/admin/admin_config_rewrite_rows.tpl index 2565719573..a1630bcdd5 100644 --- a/templates/de/html/admin/admin_config_rewrite_rows.tpl +++ b/templates/de/html/admin/admin_config_rewrite_rows.tpl @@ -1,9 +1,8 @@ - + + {--YES--}: + {--NO--}: + diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index fdf3f3ee0d..2805b99cc8 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -1,78 +1,52 @@ +
    -
    - {--PRIMERA_ADMIN_CONFIG_TITLE--} + {--ADMIN_PRIMERA_CONFIG_TITLE--}
    {--PRIMERA_ADMIN_API_NAME--}:{--ADMIN_PRIMERA_API_NAME--}:
    {--PRIMERA_ADMIN_API_MD5--}:{--ADMIN_PRIMERA_API_MD5--}:
    @@ -26,20 +26,20 @@
    {--PRIMERA_ADMIN_REFID--}:{--ADMIN_PRIMERA_REFID--}:
    {--PRIMERA_ADMIN_MIN_PAYOUT--}:{--ADMIN_PRIMERA_MIN_PAYOUT--}: Wernis
    {--PRIMERA_ADMIN_MIN_WITHDRAW--}:{--ADMIN_PRIMERA_MIN_WITHDRAW--}: Wernis @@ -55,6 +55,6 @@
    - {--PRIMERA_ADMIN_CONFIG_NOTE--} + {--ADMIN_PRIMERA_CONFIG_NOTE--}
    diff --git a/templates/de/html/admin/admin_config_rallye_edit_row.tpl b/templates/de/html/admin/admin_config_rallye_edit_row.tpl index ccd10d123a..889095e308 100644 --- a/templates/de/html/admin/admin_config_rallye_edit_row.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit_row.tpl @@ -1,16 +1,16 @@
    -   + + + + + + +   
    $content[module] $content[title]$content[title] - {--YES--}:  - {--NO--}: 
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - -
    + {--ADMIN_SETUP_STATS_TITLE--}
     
    {--ADMIN_GSTATS_MEMBERS--}:
    +     		{--ADMIN_GSTATS_MEMBERS--}:
    ({--ADMIN_GSTATS_MEMBERS_NOTE--})
    		  +
     
     
    {--ADMIN_GSTATS_MODULES--}:
    +     		{--ADMIN_GSTATS_MODULES--}:
    ({--ADMIN_GSTATS_MODULES_NOTE--})
    		 
     
     
    {--ADMIN_GSTATS_INACTIVE--}:
    +     		{--ADMIN_GSTATS_INACTIVE--}:
    ({--ADMIN_GSTATS_INACTIVE_NOTE--})
    		  +
     
    + {--ADMIN_MEMBER_STATS_TITLE--}
     
    {--ADMIN_MEMBER_STATS_LIMIT--}:  + {--ADMIN_MEMBER_STATS_LIMIT--}:
     
    +
    +
    diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 3875da01a2..d36fffb098 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -114,7 +114,6 @@ {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE--} -   {--ADMIN_CONFIG_SURFBAR_PAUSE_MODE_INTERNAL--} diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index 351aa32b8f..fb224dd0d0 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -2,75 +2,47 @@
    - - - - - - - - - + - + + - - + + - - - - - - - - - - - - + - - - - - - - - - - - + - - - - diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 98633a7c22..aaf1b1ac9d 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -2,67 +2,43 @@
    - {--ADMIN_CONFIG_TITLE_SETTINGS--}
     
    {--ADMIN_TITLE_ENABLE_DECORATIONS--}: $content[enable_title_deco] + {--ADMIN_CONFIG_TITLE_SETTINGS--} +
     {--ADMIN_TITLE_ENABLE_DECORATIONS--}:$content[enable_title_deco]
    {--ADMIN_TITLE_ENABLE_MODULE_TITLE--}:  $content[enable_mod_title]
     {--ADMIN_TITLE_ENABLE_WHAT_TITLE--}:$content[enable_what_title]
    {--ADMIN_TITLE_ENABLE_WHAT_TITLE--}: $content[enable_what_title]
     
    - {--ADMIN_CONFIG_TITLE_DECORATIONS--}
      + {--ADMIN_CONFIG_TITLE_DECORATIONS--} +
    {--ADMIN_TITLE_LEFT--}: 
     
    {--ADMIN_TITLE_MIDDLE--}: 
     
    {--ADMIN_TITLE_RIGHT--}:  + {--ADMIN_TITLE_RIGHT--}:
     
    +
    - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + - - - - diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 12f3659a56..042ef20f8a 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -2,172 +2,105 @@
    + {--ADMIN_CONFIG_TRANSFER_HEADER--}
     
    {--ADMIN_TRANSFER_MAX--}:  + {--ADMIN_TRANSFER_MAX--}:
     
    {--ADMIN_TRANSFER_AGE--}:  $content[age_selection]
     
    {--ADMIN_TRANSFER_TIMEOUT--}:  $content[timeout_selection]
     
    {--ADMIN_TRANSFER_BALANCE--}:  ({?POINTS?})
     
    {--ADMIN_TRANSFER_CODE--}:
    ({--ADMIN_TRANSFER_CODE_NOTE--})
    		 
     
    {--ADMIN_AUTOPURGE_TRANSFER--}  + {--ADMIN_AUTOPURGE_TRANSFER--}
     
    +
    - - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - + - - - - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - + - - - - - - - - - + - - - - - - + - - - - @@ -176,7 +109,7 @@
    - {--WERNIS_ADMIN_CONFIG_NOTE--} + {--ADMIN_WERNIS_CONFIG_NOTE--}
    diff --git a/templates/de/html/admin/admin_del_cats_row.tpl b/templates/de/html/admin/admin_del_cats_row.tpl index 2b981b9306..79bba30c8d 100644 --- a/templates/de/html/admin/admin_del_cats_row.tpl +++ b/templates/de/html/admin/admin_del_cats_row.tpl @@ -1,17 +1,10 @@ - + - - - - - - - - - - + diff --git a/templates/de/html/admin/admin_del_payments_row.tpl b/templates/de/html/admin/admin_del_payments_row.tpl index defdfbcd49..08e22f3574 100644 --- a/templates/de/html/admin/admin_del_payments_row.tpl +++ b/templates/de/html/admin/admin_del_payments_row.tpl @@ -1,16 +1,11 @@ - + - - - - - - - + diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl index 78c44840e9..2241b46c13 100644 --- a/templates/de/html/admin/admin_del_sponsor.tpl +++ b/templates/de/html/admin/admin_del_sponsor.tpl @@ -1,32 +1,26 @@ -
    - {--WERNIS_ADMIN_CONFIG_TITLE--} + + {--ADMIN_WERNIS_CONFIG_TITLE--}
     
    {--WERNIS_ADMIN_API_ID--}:  + {--ADMIN_WERNIS_API_ID--}:
     
    {--WERNIS_ADMIN_API_MD5--}:  + {--ADMIN_WERNIS_API_MD5--}:
     
    {--WERNIS_ADMIN_API_URL--}:  + {--ADMIN_WERNIS_API_URL--}:
     
    {--WERNIS_ADMIN_REFID--}:  + {--ADMIN_WERNIS_REFID--}:
    {--WERNIS_ADMIN_WPASS--}:  + {--ADMIN_WERNIS_WPASS--}:
     
     
    {--WERNIS_ADMIN_MIN_PAYOUT--}:  + {--ADMIN_WERNIS_MIN_PAYOUT--}: Wernis
     
    {--WERNIS_ADMIN_MIN_WITHDRAW--}:  + {--ADMIN_WERNIS_MIN_WITHDRAW--}: Wernis
     
    {--WERNIS_ADMIN_PAYOUT_FACTOR--}:  + {--ADMIN_WERNIS_PAYOUT_FACTOR--}:
     
    {--WERNIS_ADMIN_WITHDRAW_FACTOR--}:  + {--ADMIN_WERNIS_WITHDRAW_FACTOR--}:
     
    {--WERNIS_ADMIN_PAYOUT_FEE_PERCENT--}:  + {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}:
     
    {--WERNIS_ADMIN_WITHDRAW_FEE_PERCENT--}:  + {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}: %
     
    {--WERNIS_ADMIN_PAYOUT_FEE_FIX--}:  + {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}: ({?POINTS?})
     
    {--WERNIS_ADMIN_WITHDRAW_FEE_FIX--}:  + {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}: ({?POINTS?})
     
     
    {--WERNIS_ADMIN_PAYOUT_ACTIVE--}  + {--ADMIN_WERNIS_PAYOUT_ACTIVE--}: {--YES--} {--NO--}
     
    {--WERNIS_ADMIN_WITHDRAW_ACTIVE--}  + {--ADMIN_WERNIS_WITHDRAW_ACTIVE--}: {--YES--} {--NO--}
     
    +
      + {--CATEGORY_ID--} $content[id]: +
    {--CATEGORY_ID--} - $content[id]:
    $content[cat]
      + $content[cat] +
    {--PAYMENT_ID--} - $content[id]: + {--PAYMENT_ID--} $content[id]: +
     
    $content[time] - {--_SECONDS--} ($content[title])
      + $content[time] {--_SECONDS--} ($content[title]) + +
    - - - - - - - - - - - - - - - - - - - -
    -
    {--ADMIN_HEADER_DEL_SPONSOR_1--}$content[userid]{--ADMIN_HEADER_DEL_SPONSOR_2--}
    -
     
    - {--ADMIN_TEXT_DEL_SPONSOR_1--}$content[userid]{--ADMIN_TEXT_DEL_SPONSOR_2--} -
     
    - $content[gender] $content[surname] $content[family]($content[email]) -
     
     
    - - -
    +
    + +
    +
    {--ADMIN_HEADER_DEL_SPONSOR_1--}$content[userid]{--ADMIN_HEADER_DEL_SPONSOR_2--}
    +
    + +
    + {--ADMIN_TEXT_DEL_SPONSOR_1--}$content[userid]{--ADMIN_TEXT_DEL_SPONSOR_2--} +
    + +
    + $content[gender] $content[surname] $content[family]($content[email]) +
    + +
    + +
    + +
    + + +
    + +
    diff --git a/templates/de/html/admin/admin_edit_admins_row.tpl b/templates/de/html/admin/admin_edit_admins_row.tpl index 4e6ea957a6..4d903b590b 100644 --- a/templates/de/html/admin/admin_edit_admins_row.tpl +++ b/templates/de/html/admin/admin_edit_admins_row.tpl @@ -1,22 +1,23 @@ $content[id] - - -   - - + + + + + + + + + + + + + + + + diff --git a/templates/de/html/admin/admin_edit_cats.tpl b/templates/de/html/admin/admin_edit_cats.tpl index a90a7abc42..f02dc4c4aa 100644 --- a/templates/de/html/admin/admin_edit_cats.tpl +++ b/templates/de/html/admin/admin_edit_cats.tpl @@ -1,16 +1,18 @@ +
    - $content -
    + {--EDIT_CATEGORIES--}:
    +
    +
    diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl index 5947dc8850..97c0016213 100644 --- a/templates/de/html/admin/admin_edit_cats_row.tpl +++ b/templates/de/html/admin/admin_edit_cats_row.tpl @@ -1,36 +1,21 @@ - -  {--CATEGORY_ID--} $content[id]: + + {--CATEGORY_ID--} $content[id]: + -   - - - {--CAT_DESCRIPTION--}:  -   - - - -   + {--CAT_DESCRIPTION--}:  + + + {--CAT_IS_VISIBLE--}  -   $content[vis] - -   - {--SORT_KEY--}:  -   - - - -   + + + diff --git a/templates/de/html/admin/admin_edit_email.tpl b/templates/de/html/admin/admin_edit_email.tpl index ad00a64cc5..921c3a3987 100644 --- a/templates/de/html/admin/admin_edit_email.tpl +++ b/templates/de/html/admin/admin_edit_email.tpl @@ -1,7 +1,8 @@ +
    - @@ -9,7 +10,6 @@ - @@ -18,7 +18,6 @@ - @@ -27,13 +26,12 @@ - -
    + {--ADMIN_EDIT_EMAIL--}: ($content[id])
    {--EDIT_URL--}:   {--EMAIL_EDIT_SUBJ--}:   {--EMAIL_EDIT_TEXT--}:  
    + @@ -41,3 +39,4 @@
    +
    diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl index a6350ea006..7a307ed837 100644 --- a/templates/de/html/admin/admin_edit_email_row.tpl +++ b/templates/de/html/admin/admin_edit_email_row.tpl @@ -1,12 +1,10 @@ -   - + + $content[id] -   - + $content[subject] ({--EMAIL_SENDER--}: $content[userid]; $content[pay]; $content[cat]) -   diff --git a/templates/de/html/admin/admin_edit_email_select.tpl b/templates/de/html/admin/admin_edit_email_select.tpl index 1fc5a61923..b199182a28 100644 --- a/templates/de/html/admin/admin_edit_email_select.tpl +++ b/templates/de/html/admin/admin_edit_email_select.tpl @@ -2,13 +2,13 @@
    - $content - diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index 6581122dfb..d7d8e78076 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -1,46 +1,30 @@ - - - - - + - - - - - + - - - - + - - - - - + - - - diff --git a/templates/de/html/admin/admin_edit_rallyes_row.tpl b/templates/de/html/admin/admin_edit_rallyes_row.tpl index 3d84d21d98..8c6e874413 100644 --- a/templates/de/html/admin/admin_edit_rallyes_row.tpl +++ b/templates/de/html/admin/admin_edit_rallyes_row.tpl @@ -1,82 +1,42 @@ - - - - - - - - + - - - - - - - - - - - + - - - +
    $content[s_day]. $content[s_month]. $content[s_year]
    +
    $content[s_hour]: $content[s_min]: $content[s_sec]
    + - - + - - - - - - +
    $content[e_day]. $content[e_month]. $content[e_year]
    +
    $content[e_hour]: $content[e_min]: $content[e_sec]
    + - - - - - - - - + - - - - - + diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl index a765298a18..1c3671922a 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -1,31 +1,26 @@ +
    + {--ADMIN_SELECT_EMAIL_EDIT--}:
    +
    + {--PAYMENT_ID--} $content[id]:
     
    {--PAY_TIME--}: {--PAY_TIME--}: {--_SECONDS--}
     
    {--PAY_PAYMENT--}: {--PAY_PAYMENT--}: {?POINTS?}
     
    {--PAY_PRICE--}: {--PAY_PRICE--}: ({?POINTS?})
     
    {--PAY_TITLE--}:  + {--PAY_TITLE--}:
     
     
    {--RALLYE_TITLE--}: 
    + +
    {--RALLYE_DESCR--}:  + +
    {--RALLYE_TEMPLATE--}:  $content[templ]
     
    {--RALLYE_START_DAY--}: {--RALLYE_START_DAY--}: - $content[s_day]. $content[s_month]. $content[s_year]
    - $content[s_hour]: $content[s_min]: $content[s_sec]
     
    {--RALLYE_END_DAY--}: {--RALLYE_END_DAY--}: - $content[e_day]. $content[e_month]. $content[e_year]
    - $content[e_hour]: $content[e_min]: $content[e_sec]
     
     
    {--RALLYE_MIN_USERS_MINI--}: 
     
      + +
    {--RALLYE_MIN_PRICES_MINI--}: 
      + +
    - - + - - - - - + + - - - - + + - - +
     
    - {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
    - $content[contact] -     		+
    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
    +
    $content[contact]
    +
     
     
    {--ADMIN_SUM_SPONSOR_POINTS--}: {--ADMIN_SUM_SPONSOR_POINTS--}:
     
    {--ENTER_ADD_REASON--}: {--ENTER_ADD_REASON--}:
     
    - - - + + +
    +
    diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index 2cff8862d9..6a1eb6dd7a 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -1,66 +1,49 @@ -
    +
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    + {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ($content[id])
      + {--ADMIN_SPONSOR_COMPANY_NOTE--}  
     
      {--SPONSOR_ENTER_COMPANY_TITLE--}:     
      {--SPONSOR_ENTER_COMPANY_POSITION--}:     
      + {--SPONSOR_ENTER_TAX_IDENT--}:    +  
     
      + {--ADMIN_SPONSOR_ENTER_PERSONA_DATA--}  
     
      {--GUEST_GENDER--}:    
     
      {--SURNAME_FAMILY--}:    
     
      {--SPONSOR_ENTER_STREET_NR1--}:    
      {--SPONSOR_ENTER_STREET_NR2--}:    
     
      {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:   - - + -  
     
      {--SPONSOR_ENTER_PHONE--}:     
      {--SPONSOR_ENTER_FAX--}:     
      {--SPONSOR_ENTER_CELL--}:     
     
      {--EMAIL--}:    
      + {--SPONSOR_ENTER_URL--}:    +  
     
    + {--ADMIN_SPONSOR_ENTER_PASSWORDS--}
     
      + {--SPONSOR_ENTER_PASSWORDS--}:    +  
      +
    {--ADMIN_EDIT_USER_PASSWORD_NOTE--}
    		 
     
      + {--ADMIN_SPONSOR_WARNINGS_POINTS--}  
     
      {--SPONSOR_RECEIVE_WARNINGS--}:    $content[receive_warnings]  
      + {--SPONSOR_WARNING_INTERVAL--}:    + $content[interval]  
     
    +
    -
    + +
    diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl index 1a8ca370be..c7c116f79c 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -1,31 +1,26 @@ +
    - - + - - - - - + + - - - - + + - - +
     
    - {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
    - $content[contact] -     		+
    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
    +
    $content[contact]
    +
     
     
    {--ADMIN_SUM_SPONSOR_POINTS--}: {--ADMIN_SUM_SPONSOR_POINTS--}:
     
    {--ENTER_SUB_REASON--}: {--ENTER_SUB_REASON--}:
     
    - - - + + +
    +
    diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 1cb626ce7d..ae865184c1 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -1,81 +1,69 @@ - + {--EMAIL_SENDER--}:
    $content[u_link] - + {--EMAIL_SUBJECT--}:
    $content[subject] - + {--EMAIL_TEXT--}:
    $content[text] -   - - - + {--EMAIL_PAYMENT--}:
    $content[pay] - + {--EMAIL_CATEGORY--}:
    $content[cat] -   - - - + {--EMAIL_RECEIVERS--}:
    $content[sent] ({--EMAIL_RUIDS--}: $content[ruserids]) - + {--USERS_LINKS--}:
    $content[unconfirmed] - + {--EMAIL_POOL_TYPE--}:
    $content[type] -   - - - + {--EMAIL_TSEND--}:
    $content[target_send] - + {--EMAIL_URL--}:
    {--ADMIN_TEST_URL--} - + {--EMAIL_TIMESTAMP--}:
    $content[timestamp] -   - - - +
    {--EMAIL_URL--}:
    $content[url]
    - + {--_UNUSED--}:
    --- - + {--ADMIN_DELETE_NORMAL_MAIL--} diff --git a/templates/de/html/admin/admin_email_nav_row.tpl b/templates/de/html/admin/admin_email_nav_row.tpl index efcd70bab2..0832a84809 100644 --- a/templates/de/html/admin/admin_email_nav_row.tpl +++ b/templates/de/html/admin/admin_email_nav_row.tpl @@ -1,13 +1,10 @@ - $content[sep] - - - + [ {--EMAILS_PAGENAV--}: $content[nav] ] +
    - [ {--EMAILS_PAGENAV--}: $content[nav] ]
     
    diff --git a/templates/de/html/admin/admin_extensions_delete.tpl b/templates/de/html/admin/admin_extensions_delete.tpl index 69d2d91d35..f8a66cd162 100644 --- a/templates/de/html/admin/admin_extensions_delete.tpl +++ b/templates/de/html/admin/admin_extensions_delete.tpl @@ -1,3 +1,4 @@ +
    @@ -19,3 +20,4 @@
    +
    diff --git a/templates/de/html/admin/admin_extensions_delete_row.tpl b/templates/de/html/admin/admin_extensions_delete_row.tpl index f3d523b533..deec0c8f50 100644 --- a/templates/de/html/admin/admin_extensions_delete_row.tpl +++ b/templates/de/html/admin/admin_extensions_delete_row.tpl @@ -4,10 +4,10 @@ -  $content[ext_name] + $content[ext_name] -  v$content[ext_ver] + v$content[ext_ver]   diff --git a/templates/de/html/admin/admin_gmenu_delete_row.tpl b/templates/de/html/admin/admin_gmenu_delete_row.tpl index 97ab5979c8..b217296ee1 100644 --- a/templates/de/html/admin/admin_gmenu_delete_row.tpl +++ b/templates/de/html/admin/admin_gmenu_delete_row.tpl @@ -1,6 +1,9 @@ - $content[cnt]. {--ENTRY_DELETE--}:   - - $content[menu] - \ No newline at end of file + + $content[cnt]. {--ENTRY_DELETE--}: + + + $content[menu] + + + diff --git a/templates/de/html/admin/admin_gmenu_edit_row.tpl b/templates/de/html/admin/admin_gmenu_edit_row.tpl index 6f52cbbe1f..f8c8b3f6e4 100644 --- a/templates/de/html/admin/admin_gmenu_edit_row.tpl +++ b/templates/de/html/admin/admin_gmenu_edit_row.tpl @@ -1,37 +1,29 @@ -   + + $content[cnt]. {--ENTRY_MODIFY--}: + -   $content[cnt]. {--ENTRY_MODIFY--}: + + {--EDIT_ACTION--}: + + + $content[action] + -   + + {--EDIT_WHAT--}: + + + $content[what] + - - {--EDIT_ACTION--}:   - - $content[action] + + {--EDIT_TITLE--}: + + + + - -   - - - - {--EDIT_WHAT--}:   - - $content[what] - - -   - - - - {--EDIT_TITLE--}:   - - - -   - \ No newline at end of file diff --git a/templates/de/html/admin/admin_gmenu_status.tpl b/templates/de/html/admin/admin_gmenu_status.tpl index 4bc812e949..6257467afb 100644 --- a/templates/de/html/admin/admin_gmenu_status.tpl +++ b/templates/de/html/admin/admin_gmenu_status.tpl @@ -2,21 +2,18 @@
    - - - - - - - $content[rows] - $content[rows] - +
     
    - {--CHANGE_GUEST_MENU--}
    -
    - {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--} +     		+
    + {--CHANGE_GUEST_MENU--} +
    +
    + {--CHANGE_MENU_1--}$content[chk]{--CHANGE_MENU_2--} +
     
    + diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl index 8ac265926e..28c65fcad8 100644 --- a/templates/de/html/admin/admin_list_autopurge.tpl +++ b/templates/de/html/admin/admin_list_autopurge.tpl @@ -12,6 +12,8 @@
      + {--ADMIN_LIST_AUTOPURGE_FOOTER--} +
    diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index e221b671d0..815652bdd2 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -1,10 +1,10 @@ - - - - - diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl index a831ea3b1b..7c9b99c4fa 100644 --- a/templates/de/html/admin/admin_list_beg_rows.tpl +++ b/templates/de/html/admin/admin_list_beg_rows.tpl @@ -1,7 +1,7 @@ - - - + + + diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index b246c5f3a0..ca23323dba 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -1,10 +1,11 @@ +
    + {--BEG_RANK--} + {--_UID--}: @@ -13,22 +13,22 @@ {--BEG_TOTAL--}: + - {--BEG_MEMBER_TOTAL--}:  + + {--BEG_MEMBER_TOTAL--}: -  $content[total] {?POINTS?} + + $content[total] {?POINTS?}  
    + $content[withdraw_form]
    $content[win1]$content[cnt]$content[win2] $content[win1]$content[userid]$content[win2] $content[win1]$content[gender] $content[surname] $content[family]$content[win2] $content[turbo] {?POINTS?} $content[last_online]$content[win1]$content[gender] $content[surname] $content[family]$content[win2]$content[turbo] {?POINTS?}$content[last_online]
    - - - $content[rows] - - + @@ -33,7 +36,11 @@
    + {--BONUS_RANK--} + {--_UID--}: @@ -13,16 +14,18 @@ {--BONUS_TURBO_TOTAL2--}: + {--ADMIN_LAST_ONLINE--}:
    + {--BONUS_MEMBER_TOTAL--}:   $content[total] {?POINTS?} + $content[total] {?POINTS?} +  
    - {--ADMIN_BONUS_WINNER_HIGLIGHTED--}
    -
    - {--ADMIN_BONUS_TIMEOUT_1--}$content[autopurge_timeout]{--ADMIN_BONUS_TIMEOUT_2--} +
    + {--ADMIN_BONUS_WINNER_HIGLIGHTED--} +
    +
    + {--ADMIN_BONUS_TIMEOUT_1--}$content[autopurge_timeout]{--ADMIN_BONUS_TIMEOUT_2--} +
    + - {--EMAIL_SUBJECT--}:
    - $content[subject] +
    {--EMAIL_SUBJECT--}:
    +
    $content[subject]
    - {--EMAIL_TEXT--}:
    - $content[text] +
    {--EMAIL_TEXT--}:
    +
    $content[text]
    -  - {--EMAIL_POINTS--}:
    - $content[points] {?POINTS?} +
    {--EMAIL_POINTS--}:
    +
    $content[points] {?POINTS?}
    - {--EMAIL_SECONDS--}:
    - $content[time] +
    {--EMAIL_SECONDS--}:
    +
    $content[time]
    - {--EMAIL_CATEGORY--}:
    - $content[category] +
    {--EMAIL_CATEGORY--}:
    +
    $content[category]
    -  - {--EMAIL_RECEIVERS--}:
    - $content[mails_sent] - ({--EMAIL_RUIDS--}: $content[receivers]) +
    {--EMAIL_RECEIVERS--}:
    +
    $content[mails_sent] + ({--EMAIL_RUIDS--}: $content[receivers])
    - {--USERS_LINKS--}:
    - $content[unconfirmed] +
    {--USERS_LINKS--}:
    +
    $content[unconfirmed]
    - {--EMAIL_POOL_TYPE--}:
    - $content[type] +
    {--EMAIL_POOL_TYPE--}:
    +
    $content[type]
    -  - {--EMAIL_TSEND--}:
    - $content[target_send] +
    {--EMAIL_TSEND--}:
    +
    $content[target_send]
    - {--EMAIL_URL--}:
    - {--ADMIN_TEST_URL--} +
    {--EMAIL_URL--}:
    + - {--EMAIL_TIMESTAMP--}:
    - $content[timestamp] +
    {--EMAIL_TIMESTAMP--}:
    +
    $content[timestamp]
    - 
    {--EMAIL_URL--}:
    diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl index 987a2fb6ac..61169443d7 100644 --- a/templates/de/html/admin/admin_list_bonus_rows.tpl +++ b/templates/de/html/admin/admin_list_bonus_rows.tpl @@ -1,7 +1,7 @@ $content[win1]$content[cnt]$content[win2] $content[win1]$content[userid]$content[win2] -  $content[win1]$content[gender] $content[surname] $content[family]$content[win2] -  $content[points] {?POINTS?} -  $content[last_online] + $content[win1]$content[gender] $content[surname] $content[family]$content[win2] + $content[points] {?POINTS?} + $content[last_online] diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl index ef5f51d187..89b1a20984 100644 --- a/templates/de/html/admin/admin_list_doubler_already.tpl +++ b/templates/de/html/admin/admin_list_doubler_already.tpl @@ -1,3 +1,4 @@ +
    $content[rows] - +
    @@ -20,6 +21,9 @@
      + {--ADMIN_DOUBLER_FOOTER--} +
    +
    diff --git a/templates/de/html/admin/admin_list_doubler_waiting.tpl b/templates/de/html/admin/admin_list_doubler_waiting.tpl index 7ec6e47429..92f8cfff6f 100644 --- a/templates/de/html/admin/admin_list_doubler_waiting.tpl +++ b/templates/de/html/admin/admin_list_doubler_waiting.tpl @@ -1,3 +1,4 @@ +
    $content[rows] - +
    @@ -12,6 +13,9 @@
      + {--ADMIN_DOUBLER_FOOTER--} +
    +
    diff --git a/templates/de/html/admin/admin_list_notify_emails_row.tpl b/templates/de/html/admin/admin_list_notify_emails_row.tpl index 414c7c4673..7acc8d6368 100644 --- a/templates/de/html/admin/admin_list_notify_emails_row.tpl +++ b/templates/de/html/admin/admin_list_notify_emails_row.tpl @@ -8,7 +8,6 @@ $content[text] -  {--EMAIL_POINTS--}:
    @@ -23,7 +22,6 @@ $content[category] -  {--EMAIL_RECEIVERS--}:
    @@ -39,7 +37,6 @@ $content[type] -  {--EMAIL_TSEND--}:
    @@ -54,7 +51,6 @@ $content[timestamp] - 
    {--EMAIL_URL--}:
    diff --git a/templates/de/html/admin/admin_list_primera_main.tpl b/templates/de/html/admin/admin_list_primera_main.tpl index 236cbf44bd..8ec0435004 100644 --- a/templates/de/html/admin/admin_list_primera_main.tpl +++ b/templates/de/html/admin/admin_list_primera_main.tpl @@ -1,16 +1,21 @@ +
    + - - - - - - + + + + + + $content - +
    {--ID_SELECT--} {--_UID--}{--PRIMERA_ADMIN_ACCOUNT--}{--PRIMERA_ADMIN_TRANSFERED--}{--PRIMERA_ADMIN_TIMESTAMP--}{--PRIMERA_ADMIN_TYPE--}{--PRIMERA_ADMIN_API_MESSAGE--}{--PRIMERA_ADMIN_API_STATUS--}{--ADMIN_PRIMERA_ACCOUNT--}{--ADMIN_PRIMERA_TRANSFERED--}{--ADMIN_PRIMERA_TIMESTAMP--}{--ADMIN_PRIMERA_TYPE--}{--ADMIN_PRIMERA_API_MESSAGE--}{--ADMIN_PRIMERA_API_STATUS--}
      + {--ADMIN_PRIMERA_FOOTER--} +
    +
    diff --git a/templates/de/html/admin/admin_list_rallye_prices.tpl b/templates/de/html/admin/admin_list_rallye_prices.tpl index 444d0309e3..4e3bdf650c 100644 --- a/templates/de/html/admin/admin_list_rallye_prices.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices.tpl @@ -13,11 +13,9 @@ $content -   + + {--ADMIN_RALLYE_PRICES_NOTE--} + - -
    - {--ADMIN_RALLYE_PRICES_NOTE--} -
    diff --git a/templates/de/html/admin/admin_list_refs_row.tpl b/templates/de/html/admin/admin_list_refs_row.tpl index a0d26dbdba..a427d59da2 100644 --- a/templates/de/html/admin/admin_list_refs_row.tpl +++ b/templates/de/html/admin/admin_list_refs_row.tpl @@ -1,8 +1,8 @@ $content[u_link]   $content[refs_link] -  $content[gender] $content[surname] $content[family] -  $content[email] -  $content[status] -  $content[registered] + $content[gender] $content[surname] $content[family] + $content[email] + $content[status] + $content[registered] diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 65a0b7c0a0..9033704808 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -7,7 +7,7 @@ {--SPONSOR_ID--}:  -  $content[id] [ $content[status] ] + $content[id] [$content[status]] @@ -15,16 +15,16 @@ - {--SPONSOR_ENTER_COMPANY_TITLE--}:  -  $content[company] + {--SPONSOR_ENTER_COMPANY_TITLE--}: + $content[company] - {--SPONSOR_ENTER_COMPANY_POSITION--}:  -  $content[position] + {--SPONSOR_ENTER_COMPANY_POSITION--}: + $content[position] - {--SPONSOR_ENTER_TAX_IDENT--}:  -  $content[tax_ident] + {--SPONSOR_ENTER_TAX_IDENT--}: + $content[tax_ident] @@ -32,40 +32,40 @@ - {--SURNAME_FAMILY--}:  -  $content[gender] $content[surname] $content[family] + {--SURNAME_FAMILY--}: + $content[gender] $content[surname] $content[family] - {--SPONSOR_ENTER_STREET_NR1--}:  -  $content[street_nr1] + {--SPONSOR_ENTER_STREET_NR1--}: + $content[street_nr1] - {--SPONSOR_ENTER_STREET_NR2--}:  -  $content[street_nr2] + {--SPONSOR_ENTER_STREET_NR2--}: + $content[street_nr2] - {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:  -  $content[country]-$content[zip] $content[city] + {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}: + $content[country]-$content[zip]$content[city] - {--SPONSOR_ENTER_PHONE--}:  -  $content[phone] + {--SPONSOR_ENTER_PHONE--}: + $content[phone] - {--SPONSOR_ENTER_FAX--}:  -  $content[fax] + {--SPONSOR_ENTER_FAX--}: + $content[fax] - {--SPONSOR_ENTER_CELL--}:  -  $content[cell] + {--SPONSOR_ENTER_CELL--}: + $content[cell] - {--SPONSOR_ENTER_EMAIL--}:  -  $content[email]  + {--SPONSOR_ENTER_EMAIL--}: + $content[email] - {--SPONSOR_ENTER_URL--}:  -  [ {--ADMIN_TEST_URL--} ]  + {--SPONSOR_ENTER_URL--}: + [{--ADMIN_TEST_URL--}] @@ -73,20 +73,20 @@ - {--SPONSOR_RECEIVE_WARNINGS_SHORT--}:  + {--SPONSOR_RECEIVE_WARNINGS_SHORT--}: $content[receive_warnings] - {--SPONSOR_WARNING_INTERVAL_SHORT--}:  + {--SPONSOR_WARNING_INTERVAL_SHORT--}: $content[warning_interval] - {--SPONSOR_POINTS_AMOUNT--}:  -  [ $content[points_amount] ] + {--SPONSOR_POINTS_AMOUNT--}: + [$content[points_amount]] - {--SPONSOR_POINTS_USED--}:  -  [ $content[points_used] ] + {--SPONSOR_POINTS_USED--}: + [$content[points_used]] @@ -94,37 +94,37 @@ - {--SPONSOR_CREATED--}:  + {--SPONSOR_CREATED--}: $content[created] - {--ADMIN_LAST_ONLINE--}:  + {--ADMIN_LAST_ONLINE--}: $content[last_online] - {--ADMIN_LAST_CHANGE--}:  + {--ADMIN_LAST_CHANGE--}: $content[last_change] - {--REMOTE_IP--}:  + {--REMOTE_IP--}: $content[remote_addr] - {--SPONSOR_REFID--}:  + {--SPONSOR_REFID--}: $content[refid] - {--SPONSOR_REFERALS--}:  - [ $content[ref_count] ] + {--SPONSOR_REFERALS--}: + [$content[ref_count]]
    {--ADMIN_SPONSOR_ACTIONS--}:
    diff --git a/templates/de/html/admin/admin_list_theme_row.tpl b/templates/de/html/admin/admin_list_theme_row.tpl index 58bbb53819..3f4a8afe73 100644 --- a/templates/de/html/admin/admin_list_theme_row.tpl +++ b/templates/de/html/admin/admin_list_theme_row.tpl @@ -1,13 +1,13 @@ - $content[index]. - $content[name] - $content[created] - $content[size] {--KBYTES--} - $content[version] ($content[current]) + $content[index]. + $content[name] + $content[created] + $content[size] {--KBYTES--} + $content[version] ($content[current]) -   - -
    $content[infos]
    - +   + +
    $content[infos]
    + diff --git a/templates/de/html/admin/admin_list_transfer_row.tpl b/templates/de/html/admin/admin_list_transfer_row.tpl index fe2e3af5d1..eff3d910b0 100644 --- a/templates/de/html/admin/admin_list_transfer_row.tpl +++ b/templates/de/html/admin/admin_list_transfer_row.tpl @@ -3,6 +3,6 @@ $content[time_trans] $content[from_link] $content[to_link] -  $content[reason] + $content[reason] $content[points] diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index 893ad4c126..9ed6e26a60 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -1,3 +1,4 @@ +
    - - - - - -
    @@ -26,15 +27,10 @@ $content[unconfirmed]
     
    $content[rows]
     
    +
    diff --git a/templates/de/html/admin/admin_list_unconfirmed_row.tpl b/templates/de/html/admin/admin_list_unconfirmed_row.tpl index b9087f8dd0..f8b6f8b351 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_row.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_row.tpl @@ -1,8 +1,8 @@ $content[u_link] - {--CLICK_NOW--} -  $content[email] + + {--CLICK_NOW--} + + $content[email] $content[status] diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index d7ab83eb7d..25773796e8 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -1,5 +1,4 @@ -   {--_UID--}: {--GENDER--}: {--SURNAME--}: @@ -7,7 +6,6 @@ {--USER_NICKNAME--}: -   $content[userid_link] $content[gender] $content[surname] @@ -15,7 +13,6 @@ $content[nickname] -   {--EMAIL--}: {--REMOTE_IP--}: {--REF_UID--}: @@ -23,7 +20,6 @@ {--UNCONFIRMED_LINKS--}: -   $content[email] $content[REMOTE_ADDR] $content[refid] @@ -31,7 +27,6 @@ $content[links] -   {--TOTAL_POINTS--}: {--MAILS_SENT--}: {--CLICK_RATE--}: @@ -39,7 +34,6 @@ {--TOTAL_REFERALS--}: -   $content[points] {?POINTS?} $content[emails_sent] $content[rate]% @@ -47,7 +41,6 @@ $content[refs] -   {--LOCK_REASON--}: {--LOCK_TIMESTAMP--}: {--_UNUSED--}: @@ -55,7 +48,6 @@ {--_UNUSED--}: -   $content[lock_reason] $content[lock_timestamp] --- @@ -63,5 +55,5 @@ --- - $content[alinks] + $content[alinks] diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl index f3adbd7543..20e9bffc75 100644 --- a/templates/de/html/admin/admin_list_wernis_main.tpl +++ b/templates/de/html/admin/admin_list_wernis_main.tpl @@ -3,15 +3,17 @@ {--ID_SELECT--} {--_UID--} - {--WERNIS_ADMIN_WDS66_ACCOUNT--} - {--WERNIS_ADMIN_TRANSFERED--} - {--WERNIS_ADMIN_TIMESTAMP--} - {--WERNIS_ADMIN_TYPE--} - {--WERNIS_ADMIN_API_MESSAGE--} - {--WERNIS_ADMIN_API_STATUS--} + {--ADMIN_WERNIS_WDS66_ACCOUNT--} + {--ADMIN_WERNIS_TRANSFERED--} + {--ADMIN_WERNIS_TIMESTAMP--} + {--ADMIN_WERNIS_TYPE--} + {--ADMIN_WERNIS_API_MESSAGE--} + {--ADMIN_WERNIS_API_STATUS--} $content -   + + {--ADMIN_LIST_WERNIS_FOOTER--} + diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl index e9e82ce596..42447db711 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -1,6 +1,6 @@ $content[id] -  $content[name] + $content[name] $content[reload] {--_HOURS--} $content[wait] {--_SECONDS--} $content[remain] diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl index 872f61ae16..feed4ead54 100644 --- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -1,6 +1,6 @@ $content[id] -  $content[name] + $content[name] $content[reload] {--_HOURS--} $content[wait] {--_SECONDS--} $content[remain] diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index d7c289ad4f..b286be992f 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -1,34 +1,26 @@ - - - - - - - - - - - - - - - - - - - - -
    -
    $content[header_message]
    -
     
    - $content[text_message] -
     
    - $content[email_link] -
     
    - -
     
    - - -
    +
    + +
    +
    $content[header_message]
    +
    + +
    + $content[text_message] +
    + +
    + $content[email_link] +
    + +
    + +
    + +
    + + +
    + +
    diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index 2c30f1cbb9..5ce89bb523 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -12,20 +12,20 @@ - {--ENTER_ADMIN_LOGIN--}: - + {--ENTER_ADMIN_LOGIN--}: + $content[login_message] - + {--ENTER_ADMIN_PASS--}:
    [{--ADMIN_RESET_PASSWORD--}]
    - + @@ -34,9 +34,9 @@ diff --git a/templates/de/html/admin/admin_mini_online.tpl b/templates/de/html/admin/admin_mini_online.tpl index 6354cf3cdd..dcbdbcf455 100644 --- a/templates/de/html/admin/admin_mini_online.tpl +++ b/templates/de/html/admin/admin_mini_online.tpl @@ -1,25 +1,23 @@ +
    - - - - + + - -
    + {--USER_NOW_ONLINE--}
    {--GUESTS_ONLINE--}:
    		 $content[guests_online]
    {--GUESTS_ONLINE--}:
    		$content[guests_online]
    {--MEMBERS_ONLINE--}:
    		  $content[members_online]
    {--ADMINS_ONLINE--}:
    		  $content[admins_online]
    -
    \ No newline at end of file +
    diff --git a/templates/de/html/admin/admin_mmenu_delete_row.tpl b/templates/de/html/admin/admin_mmenu_delete_row.tpl index 6cc744403e..204e3b7f2d 100644 --- a/templates/de/html/admin/admin_mmenu_delete_row.tpl +++ b/templates/de/html/admin/admin_mmenu_delete_row.tpl @@ -1,8 +1,8 @@ - - $content[cnt]. {--ENTRY_DELETE--}:   + + $content[cnt]. {--ENTRY_DELETE--}: - + $content[title] diff --git a/templates/de/html/admin/admin_mmenu_edit_row.tpl b/templates/de/html/admin/admin_mmenu_edit_row.tpl index 5a934f3547..474f1b5b3c 100644 --- a/templates/de/html/admin/admin_mmenu_edit_row.tpl +++ b/templates/de/html/admin/admin_mmenu_edit_row.tpl @@ -1,37 +1,29 @@ -   + + $content[cnt]. {--ENTRY_MODIFY--}: + -   $content[cnt]. - {--ENTRY_MODIFY--}: + + {--EDIT_ACTION--}: + + + $content[action] + - + + {--EDIT_WHAT--}: + + + $content[what] + - - {--EDIT_ACTION--}:   - $content[action] - - - - - - - {--EDIT_WHAT--}:   - $content[what] - - - - - - - {--EDIT_TITLE--}:   - - - -   + + {--EDIT_TITLE--}: + + + + diff --git a/templates/de/html/admin/admin_mods_stats2.tpl b/templates/de/html/admin/admin_mods_stats2.tpl index dcc0a087be..e0d42bb871 100644 --- a/templates/de/html/admin/admin_mods_stats2.tpl +++ b/templates/de/html/admin/admin_mods_stats2.tpl @@ -1,11 +1,14 @@ - +
    +
    $content - +
    {--MODS_WHAT_ACTION--} {--MODS_CLICKS--}
      + {--ADMIN_MODS_STATS_FOOTER--} +
    + diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index 9638fb60d4..5c585f5d77 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -1,34 +1,24 @@ +
    - +
    - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - +
    - {--ADMIN_NL_TITLE--}
      + {--ADMIN_NL_TITLE--} +
     {--ENTER_NL_SUBJECT--}:  + {--ENTER_NL_SUBJECT--}:  
     
      {--ADMIN_NL_SEND_MODE--}:  - - + @@ -40,52 +30,40 @@
    {--NL_MODE_TEXT--} + {--NL_MODE_TEXT--}
    		 
     
      {--ADMIN_NL_AUTO_ADD--}:  - - - - + + + +
    {--YES--} {--NO--} {--YES--} + + {--NO--} + +
    		 
     
     {--ENTER_NL_TEXT--}:  
     {--ENTER_NL_TEXT--}: + +
      -   + + +
    -
    {--ADMIN_NEWSLETTER_NOTE--}
    +
    + {--ADMIN_NEWSLETTER_NOTE--} +
    +
    diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index 2104a52e4e..dcb3a2ed1a 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -1,66 +1,51 @@ +
    - - - - - - - - - - - + - + + - - - - - - - - - - - - - + - - - +
    - {--ADMIN_NL_TITLE--}
     
     {--ENTER_NL_SUBJECT--}:   + {--ADMIN_NL_TITLE--} +
     {--ENTER_NL_SUBJECT--}: + +
      {--ADMIN_NL_AUTO_ADD--}:  - + - +
    {--YES--}  + + {--NO--}  + +
    		 
     
      {--ENTER_NL_TEXT--}:  
      + +
      - -   + + + +
    -
    {--ADMIN_NEWSLETTER_NOTE--}
    +
    + {--ADMIN_NEWSLETTER_NOTE--} +
    +
    diff --git a/templates/de/html/admin/admin_optimize_row.tpl b/templates/de/html/admin/admin_optimize_row.tpl index 6c5c2f114b..cabc6d39bf 100644 --- a/templates/de/html/admin/admin_optimize_row.tpl +++ b/templates/de/html/admin/admin_optimize_row.tpl @@ -1,7 +1,7 @@ -  $content[b1]$content[tpl]$content[b2] + $content[b1]$content[tpl]$content[b2] $content[b1]$content[rep]$content[b2] $content[b1]$content[opt]$content[b2] -  $content[b1]$content[sum]$content[b2] -  $content[b1]$content[sav]$content[b2] + $content[b1]$content[sum]$content[b2] + $content[b1]$content[sav]$content[b2] diff --git a/templates/de/html/admin/admin_payout_accept_form.tpl b/templates/de/html/admin/admin_payout_accept_form.tpl index 5fa95bd69d..7e7db04787 100644 --- a/templates/de/html/admin/admin_payout_accept_form.tpl +++ b/templates/de/html/admin/admin_payout_accept_form.tpl @@ -1,37 +1,24 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - {--PAYOUT_ACCEPT_PAYOUT_INTRO--} -
     
    {--PAYOUT_RECEIVER_ACCEPT--}:
    - $content[user] -
     
     
    {--PAYOUT_OPTIONAL_TEXT--}:
    - -
     
    - - -
    +
    + +
    + {--PAYOUT_ACCEPT_PAYOUT_INTRO--} +
    + +
    + {--PAYOUT_RECEIVER_ACCEPT--}:
    + $content[user] +
    + +
    + {--PAYOUT_OPTIONAL_TEXT--}:
    + +
    + +
    + + +
    + +
    diff --git a/templates/de/html/admin/admin_payout_add_new.tpl b/templates/de/html/admin/admin_payout_add_new.tpl index a5c70f83f6..cbc2ef395a 100644 --- a/templates/de/html/admin/admin_payout_add_new.tpl +++ b/templates/de/html/admin/admin_payout_add_new.tpl @@ -1,116 +1,79 @@ +
    - +
    - - - - - - - - - + - + + - - - - - - - - - - - - - - + + - - - + {--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}: + - - - - - - - - - - - - - - - - - - - - - - - + - - -
    - {--ADMIN_PAYOUT_ADD_NEW_TITLE--}: -
    ({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
     
    {--ADMIN_PAYOUT_TITLE--}:  + {--ADMIN_PAYOUT_ADD_NEW_TITLE--}: +
    ({--ADMIN_PAYOUT_ADD_NEW_NOTE--})
    +
     {--ADMIN_PAYOUT_TITLE--}: + +
    {--ADMIN_PAYOUT_RATE--}  ({--ADMIN_PAYOUT_VALUE_NOTE--})
     
    {--ADMIN_PAYOUT_MIN_POINTS--}:  ({--ADMIN_PAYOUT_VALUE_NOTE--})
     
    {--ADMIN_PAYOUT_ALLOW_URLS--}: 
     {--ADMIN_PAYOUT_ALLOW_URLS--}: + +
    - {--ADMIN_PAYOUT_OPTIONAL_SETTINGS--}:
     
    {--ADMIN_PAYOUT_YOUR_ACCOUNT--}: 
     
    {--ADMIN_PAYOUT_YOUR_PASSWORD--}: 
     
    {--ADMIN_PAYOUT_YOUR_URL--}: 
     
    {--ADMIN_PAYOUT_YOUR_RET_DONE--}: 
     
    {--ADMIN_PAYOUT_YOUR_RET_FAILED--}: 
     
    {--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:  + {--ADMIN_PAYOUT_YOUR_PASS_TRANSFER--}:
     
    @@ -130,4 +90,7 @@
    -
    {--ADMIN_PAYOUT_YOUR_URL_NOTE--}
    +
    + {--ADMIN_PAYOUT_YOUR_URL_NOTE--} +
    +
    diff --git a/templates/de/html/admin/admin_payout_reject_form.tpl b/templates/de/html/admin/admin_payout_reject_form.tpl index 3d4bafdcc9..d1aec907cd 100644 --- a/templates/de/html/admin/admin_payout_reject_form.tpl +++ b/templates/de/html/admin/admin_payout_reject_form.tpl @@ -1,3 +1,4 @@ +
    @@ -5,28 +6,16 @@ {--PAYOUT_REJECT_PAYOUT_INTRO--} - - - - - - - - - - - - -
     
    {--PAYOUT_RECEIVER_REJECT--}:
    $content[user]
     
     
    {--PAYOUT_OPTIONAL_TEXT--}:
    +     		{--PAYOUT_OPTIONAL_TEXT--}:
     
    @@ -35,3 +24,4 @@
    +
    diff --git a/templates/de/html/admin/admin_points_del_row.tpl b/templates/de/html/admin/admin_points_del_row.tpl index 1f6ceac2a4..6c00c80621 100644 --- a/templates/de/html/admin/admin_points_del_row.tpl +++ b/templates/de/html/admin/admin_points_del_row.tpl @@ -1,20 +1,11 @@ - -   - {--REF_LEVEL--} $content[level]: - - - - + $content[percents]% ({--ID_SELECT--} $content[id]) - + - -   - diff --git a/templates/de/html/admin/admin_points_edit_row.tpl b/templates/de/html/admin/admin_points_edit_row.tpl index aa4f838742..97db2855d7 100644 --- a/templates/de/html/admin/admin_points_edit_row.tpl +++ b/templates/de/html/admin/admin_points_edit_row.tpl @@ -4,14 +4,14 @@ - {--REF_LEVEL--}:  - + {--REF_LEVEL--}:  + - {--REF_PERCENT--}:  - + {--REF_PERCENT--}:  + % diff --git a/templates/de/html/admin/admin_refbanner_edit.tpl b/templates/de/html/admin/admin_refbanner_edit.tpl index 88477618b0..f899bc80c7 100644 --- a/templates/de/html/admin/admin_refbanner_edit.tpl +++ b/templates/de/html/admin/admin_refbanner_edit.tpl @@ -2,13 +2,13 @@
    - $content - diff --git a/templates/de/html/admin/admin_refbanner_edit_row.tpl b/templates/de/html/admin/admin_refbanner_edit_row.tpl index 70787f13b8..6a58a92731 100644 --- a/templates/de/html/admin/admin_refbanner_edit_row.tpl +++ b/templates/de/html/admin/admin_refbanner_edit_row.tpl @@ -1,38 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/templates/de/html/admin/admin_reg_form.tpl b/templates/de/html/admin/admin_reg_form.tpl index 3c9dc9f545..a5a4cb403e 100644 --- a/templates/de/html/admin/admin_reg_form.tpl +++ b/templates/de/html/admin/admin_reg_form.tpl @@ -7,22 +7,22 @@ - - + $content[login_message] - - + $content[pass1_message] - - + diff --git a/templates/de/html/admin/admin_reset_password.tpl b/templates/de/html/admin/admin_reset_password.tpl index 666f0be2d1..3d462c1c67 100644 --- a/templates/de/html/admin/admin_reset_password.tpl +++ b/templates/de/html/admin/admin_reset_password.tpl @@ -1,3 +1,4 @@ +
    + {--EDIT_REFBANNER--}
    +
     
      {--ADMIN_EDIT_BANNER_URL--}:   
     
      {--ADMIN_EDIT_ALTERNATE--}:   
     
     {--ADMIN_SELECT_BANNER_ACTIVE--}: $content[vis] 
     {--ADMIN_SELECT_BANNER_ACTIVE--}:$content[vis]
    {--ADMIN_REG_LOGIN--}: + {--ADMIN_REG_LOGIN--}:
    {--ADMIN_REG_PASS1--}: + {--ADMIN_REG_PASS1--}:
    {--ADMIN_REG_PASS2--}: + {--ADMIN_REG_PASS2--}:
    @@ -6,10 +7,10 @@ - - @@ -25,3 +26,4 @@
    {--ADMIN_RESET_PASSWORD_NOTE--}
    + diff --git a/templates/de/html/admin/admin_reset_password_form.tpl b/templates/de/html/admin/admin_reset_password_form.tpl index d5577eb51d..c51230ef43 100644 --- a/templates/de/html/admin/admin_reset_password_form.tpl +++ b/templates/de/html/admin/admin_reset_password_form.tpl @@ -1,3 +1,4 @@ +
    + {--ADMIN_ENTER_EMAIL--} +
    @@ -6,27 +7,27 @@ - - - - - - @@ -44,3 +45,4 @@
    {--ADMIN_RESET_PASSWORD_NOTE--}
    + diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 6c4c557cf8..db5fd369c1 100644 --- a/templates/de/html/admin/admin_send_bonus_form.tpl +++ b/templates/de/html/admin/admin_send_bonus_form.tpl @@ -1,12 +1,9 @@ +
    -
    + {--ADMIN_SHOW_LOGIN--} - $content[login]
    - [{--ADMIN_CHANGE_LOGIN--}] +     		+
    $content[login]
    +
    + {--ADMIN_ENTER_PASSWORD1--} +
    + {--ADMIN_ENTER_PASSWORD2--} +
    +
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     
      {--SELECT_CATEGORY--}:   
     
      {--ENTER_RECEIVER--}:   
     
      {--ENTER_POINTS--}:   
     
      {--ENTER_SECONDS--}:   
     
      {--ENTER_SUBJECT--}:   
     
      {--ENTER_TEXT--}:   
     
      {--MEMBER_ENTER_URL--}:   
     
      +  
     
    + diff --git a/templates/de/html/admin/admin_send_reset_link.tpl b/templates/de/html/admin/admin_send_reset_link.tpl index 96ba518a15..682387f228 100644 --- a/templates/de/html/admin/admin_send_reset_link.tpl +++ b/templates/de/html/admin/admin_send_reset_link.tpl @@ -1,3 +1,4 @@ +
    @@ -6,10 +7,10 @@ - - @@ -25,3 +26,4 @@
    {--ADMIN_SEND_RESET_LINK_NOTE--}
    + diff --git a/templates/de/html/admin/admin_unlock_emails_redir.tpl b/templates/de/html/admin/admin_unlock_emails_redir.tpl index 948864f762..1f54a5d4d8 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir.tpl @@ -7,7 +7,7 @@ $content - diff --git a/templates/de/html/admin/admin_unlock_emails_redir_row.tpl b/templates/de/html/admin/admin_unlock_emails_redir_row.tpl index eb51728c5d..7c86549f21 100644 --- a/templates/de/html/admin/admin_unlock_emails_redir_row.tpl +++ b/templates/de/html/admin/admin_unlock_emails_redir_row.tpl @@ -1,8 +1,6 @@ - - - diff --git a/templates/de/html/admin/admin_validate_reset_hash_form.tpl b/templates/de/html/admin/admin_validate_reset_hash_form.tpl index 8829bc4c3f..f60f8a660d 100644 --- a/templates/de/html/admin/admin_validate_reset_hash_form.tpl +++ b/templates/de/html/admin/admin_validate_reset_hash_form.tpl @@ -1,3 +1,4 @@ +
    + {--ADMIN_ENTER_EMAIL--} +
    +
      + $content[url] 
    @@ -6,10 +7,10 @@ - - @@ -26,3 +27,4 @@
    {--ADMIN_VALIDATE_HASH_NOTE--}
    + diff --git a/templates/de/html/admin/admin_welcome.tpl b/templates/de/html/admin/admin_welcome.tpl index 5b0dde1a7d..351e0f2d7e 100644 --- a/templates/de/html/admin/admin_welcome.tpl +++ b/templates/de/html/admin/admin_welcome.tpl @@ -1,9 +1,14 @@ -: : : Willkommen zum Administrationsbereich : : : -
    +
    + : : : Willkommen zum Administrationsbereich : : : +
    + +
    + {--ADMIN_ENTER_LOGIN--} +
    -
      Hallo $username!
    +
    + Hallo $username! +
    		Aktueller Admin: @@ -14,3 +19,4 @@
    +
    diff --git a/templates/de/html/guest/guest_active_row.tpl b/templates/de/html/guest/guest_active_row.tpl index 80c88cd9b7..e0c462c901 100644 --- a/templates/de/html/guest/guest_active_row.tpl +++ b/templates/de/html/guest/guest_active_row.tpl @@ -1,5 +1,5 @@ -  $content[userid] ($content[nickname]) -  $content[points] -  $content[last_online] + $content[userid] ($content[nickname]) + $content[points] + $content[last_online] diff --git a/templates/de/html/guest/guest_cat_row.tpl b/templates/de/html/guest/guest_cat_row.tpl index 28e79ce942..fa10aa1076 100644 --- a/templates/de/html/guest/guest_cat_row.tpl +++ b/templates/de/html/guest/guest_cat_row.tpl @@ -1,14 +1,11 @@ -   -   $content[cat]   + $content[cat] - {--YES--}  + {--YES--} + + - {--NO--}  -   - - - + {--NO--} + + diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl index 6a2bad51ab..628249880e 100644 --- a/templates/de/html/guest/guest_confirm_link.tpl +++ b/templates/de/html/guest/guest_confirm_link.tpl @@ -2,31 +2,23 @@ - - - - - - - - + - - - + - - - - diff --git a/templates/de/html/guest/guest_doubler_list.tpl b/templates/de/html/guest/guest_doubler_list.tpl index ae635c8817..918fcd5408 100644 --- a/templates/de/html/guest/guest_doubler_list.tpl +++ b/templates/de/html/guest/guest_doubler_list.tpl @@ -1,14 +1,21 @@ +
    +
    {--REQUEST_CONFIRM_LINK_TITLE--}
     
    {--GUEST_CONFIRM_LINK_NOTE--}
      + {--GUEST_CONFIRM_LINK_NOTE--} +
    {--GUEST_ENTER_EMAIL--}:  + {--GUEST_ENTER_EMAIL--}:
     
    +
    + {--_UID--} + - + $content - +
    - {--_UID--} - {?POINTS?}{--DOUBLER_TIMEMARK--} + {?POINTS?} + + {--DOUBLER_TIMEMARK--}
      + {--GUEST_DOUBLER_FOOTER--} +
    + diff --git a/templates/de/html/guest/guest_header.tpl b/templates/de/html/guest/guest_header.tpl index 1ac60a8310..b3dcdedc4e 100644 --- a/templates/de/html/guest/guest_header.tpl +++ b/templates/de/html/guest/guest_header.tpl @@ -6,12 +6,12 @@ - - -{?MAIN_TITLE?} - - -
    + class="guest_header">{?MAIN_TITLE?} - - -     - + - +
      Hallo $username!
    Hallo $username!
    {?SLOGAN?}
    $content[date_time]  
    $content[date_time]
    diff --git a/templates/de/html/guest/guest_menu_whats.tpl b/templates/de/html/guest/guest_menu_whats.tpl index 51ef4021cf..34255aa676 100644 --- a/templates/de/html/guest/guest_menu_whats.tpl +++ b/templates/de/html/guest/guest_menu_whats.tpl @@ -1,3 +1,6 @@ -  ·  $content - \ No newline at end of file + + · + $content + + diff --git a/templates/de/html/guest/guest_no_rallyes.tpl b/templates/de/html/guest/guest_no_rallyes.tpl index fdbdc0c78a..d88d0b6996 100644 --- a/templates/de/html/guest/guest_no_rallyes.tpl +++ b/templates/de/html/guest/guest_no_rallyes.tpl @@ -1,23 +1,16 @@ - +
    +
    - - - - -
    Keine - Referal-Rallyes aktiv!
    -
    Derzeit ist noch keine Rallye im Gange! Bitte - kommen Sie später noch einmal wieder!
    +     		+ Keine Referal-Rallyes aktiv!
    -
      -
    +     		+
    + Derzeit ist noch keine Rallye im Gange! Bitte kommen Sie später noch einmal wieder! +
    + diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index ac8ca4392d..7eef116a0f 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -15,10 +15,10 @@ - - - - - - - - diff --git a/templates/de/html/guest/guest_register_refid.tpl b/templates/de/html/guest/guest_register_refid.tpl index b8651f324a..a5569ef667 100644 --- a/templates/de/html/guest/guest_register_refid.tpl +++ b/templates/de/html/guest/guest_register_refid.tpl @@ -1,8 +1,8 @@ - - diff --git a/templates/de/html/guest/guest_register_refid_hide.tpl b/templates/de/html/guest/guest_register_refid_hide.tpl index dafabe60db..d34402b001 100644 --- a/templates/de/html/guest/guest_register_refid_hide.tpl +++ b/templates/de/html/guest/guest_register_refid_hide.tpl @@ -1,7 +1,8 @@ - - + diff --git a/templates/de/html/guest/guest_sponsor_activate.tpl b/templates/de/html/guest/guest_sponsor_activate.tpl index 68a942cdfc..8a9c5a47f7 100644 --- a/templates/de/html/guest/guest_sponsor_activate.tpl +++ b/templates/de/html/guest/guest_sponsor_activate.tpl @@ -1,3 +1,4 @@ +
    + {--GUEST_GENDER--}$content[must_fillout_gender]: @@ -43,29 +43,29 @@
    + {--COUNTRY--}$content[must_fillout_cntry], {--ZIP--}$content[must_fillout_zip], {--CITY--}$content[must_fillout_city]: + $content[country]
    + {--EMAIL--}$content[must_fillout_email]:   +
    + {--BIRTHDAY--}$content[must_fillout_birthday]: + $content[birthday_selection]
    - {--REFID_BY--}:   + + {--REFID_BY--}: +
    - {--REFID_BY--}:   + + {--REFID_BY--}: + $content
    @@ -7,18 +8,13 @@ - - - - - - -
     
    + {--SPONSOR_ENTER_EMAIL--}: +
     
    @@ -28,11 +24,15 @@
    + +
    {--SPONSOR_HOWTO_GET_ACTIVATION_LINK--}
    -
    +
    + +
    @@ -42,3 +42,4 @@
    +
    diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl index 486fb0b020..b5b89f79d9 100644 --- a/templates/de/html/guest/guest_sponsor_infos.tpl +++ b/templates/de/html/guest/guest_sponsor_infos.tpl @@ -2,20 +2,29 @@ @@ -27,7 +36,11 @@ $content[paytypes] $content[actions] - + + +
    -
    +
    {--GUEST_SPONSOR_WANT_BECOME_HEADER--}
    -
    - {--GUEST_SPONSOR_INFOS_PRICING_HEADER--} +
    + {--GUEST_SPONSOR_INFOS_PRICING_HEADER--} +
    - {--GUEST_SPONSOR_PRICING_HEADER--}
    +
    + {--GUEST_SPONSOR_PRICING_HEADER--} +
    +
    $content[paytypes] - + + +
     
    + {--GUEST_SPONSOR_PRICING_FOOTER--} +
    +
     
    + {--GUEST_SPONSOR_ACTIONS_FOOTER--} +
    diff --git a/templates/de/html/guest/guest_sponsor_login.tpl b/templates/de/html/guest/guest_sponsor_login.tpl index 8c1a6706b5..a9c615a761 100644 --- a/templates/de/html/guest/guest_sponsor_login.tpl +++ b/templates/de/html/guest/guest_sponsor_login.tpl @@ -1,29 +1,28 @@ +
    - +
    - - - - - -
    {--SPONSOR_LOGIN_WELCOME--}
     
    + {--SPONSOR_ENTER_ID--}: +
    + {--SPONSOR_ENTER_PASSWORD--}: +
     
    @@ -33,20 +32,21 @@
    +
    -
    - +
    - +
    - »» {--SPONSOR_PASSWORD_LOST--} + [{--SPONSOR_PASSWORD_LOST--}]
    - »» {--SPONSOR_ACTIVATION_LINK_LOST--}
    + [{--SPONSOR_ACTIVATION_LINK_LOST--}]
    +
    diff --git a/templates/de/html/guest/guest_stats_cats_row.tpl b/templates/de/html/guest/guest_stats_cats_row.tpl index 18702364be..cf2d55b9a5 100644 --- a/templates/de/html/guest/guest_stats_cats_row.tpl +++ b/templates/de/html/guest/guest_stats_cats_row.tpl @@ -1,5 +1,4 @@ - $content[cat] -   + $content[cat] $content[cnt] diff --git a/templates/de/html/guest/guest_stats_member.tpl b/templates/de/html/guest/guest_stats_member.tpl index f6f82860b6..1d18571dad 100644 --- a/templates/de/html/guest/guest_stats_member.tpl +++ b/templates/de/html/guest/guest_stats_member.tpl @@ -1,53 +1,47 @@
    - + - - - - - - - + $content[month_rows] - + $content[cats_rows] - diff --git a/templates/de/html/guest/guest_stats_month_row.tpl b/templates/de/html/guest/guest_stats_month_row.tpl index 0422bace4b..b59074d943 100644 --- a/templates/de/html/guest/guest_stats_month_row.tpl +++ b/templates/de/html/guest/guest_stats_month_row.tpl @@ -1,4 +1,3 @@ - diff --git a/templates/de/html/guest/guest_stats_row.tpl b/templates/de/html/guest/guest_stats_row.tpl index f8b998aea3..6d94eb0bc2 100644 --- a/templates/de/html/guest/guest_stats_row.tpl +++ b/templates/de/html/guest/guest_stats_row.tpl @@ -1,4 +1,4 @@ - - + + diff --git a/templates/de/html/guest/guest_top10_empty4.tpl b/templates/de/html/guest/guest_top10_empty4.tpl index c9f3ad36f8..89b672b57d 100644 --- a/templates/de/html/guest/guest_top10_empty4.tpl +++ b/templates/de/html/guest/guest_top10_empty4.tpl @@ -1,6 +1,6 @@ - - - + + + diff --git a/templates/de/html/guest/guest_top10_empty5.tpl b/templates/de/html/guest/guest_top10_empty5.tpl index 9c96a0c797..b1fb9966fc 100644 --- a/templates/de/html/guest/guest_top10_empty5.tpl +++ b/templates/de/html/guest/guest_top10_empty5.tpl @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/templates/de/html/guest/guest_top10_row_earner.tpl b/templates/de/html/guest/guest_top10_row_earner.tpl index 517501b0af..53c4faa501 100644 --- a/templates/de/html/guest/guest_top10_row_earner.tpl +++ b/templates/de/html/guest/guest_top10_row_earner.tpl @@ -1,7 +1,6 @@ - - - - + + + + diff --git a/templates/de/html/guest/guest_top10_row_login.tpl b/templates/de/html/guest/guest_top10_row_login.tpl index 274eb3fe5a..9d74e1fa81 100644 --- a/templates/de/html/guest/guest_top10_row_login.tpl +++ b/templates/de/html/guest/guest_top10_row_login.tpl @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/templates/de/html/guest/guest_top10_row_refs.tpl b/templates/de/html/guest/guest_top10_row_refs.tpl index b50fbd4a15..f42ec91643 100644 --- a/templates/de/html/guest/guest_top10_row_refs.tpl +++ b/templates/de/html/guest/guest_top10_row_refs.tpl @@ -1,8 +1,7 @@ - - - - - + + + + + diff --git a/templates/de/html/impressum.tpl b/templates/de/html/impressum.tpl index 0fe1f30d3a..44bb6e343b 100644 --- a/templates/de/html/impressum.tpl +++ b/templates/de/html/impressum.tpl @@ -4,23 +4,21 @@ - - - - - - - - -
    {--GUEST_STATS--} + {--GUEST_STATS--} +
    {--USERS_TOTAL--}:  $content[total_users] {--UNCONFIRMED_USERIDS--}:  $content[unconfirmed]
    {--GUEST_STATS_MALES--}:  $content[total_males] {--GUEST_STATS_FEMALES--}:  $content[total_females]
    {--GUEST_STATS_TREGISTER--}:  $content[treg_count] {--GUEST_STATS_YREGISTER--}:  $content[yreg_count]
    {--GUEST_STATS_MONTHLY--}{--GUEST_STATS_MONTHLY--}
    {--GUEST_STATS_CATS--}{--GUEST_STATS_CATS--}
    $content[ltitle]
    $content[m_descr]:  $content[cnt]
    $content[title]  $content[counter]$content[title]$content[counter]
    $content[index] --- --- ------------
    $content[index] --- --- --- ---------------
    $content[cnt] $content[userid] ($content[nickname]) $content[points] $content[last_online]$content[cnt]$content[userid]($content[nickname])$content[points]$content[last_online]
    $content[cnt] $content[userid] ($content[nickname]) $content[total_logins] $content[points] $content[last_online]$content[userid]($content[nickname])$content[total_logins]$content[points]$content[last_online]
    $content[cnt] $content[userid] ($content[nickname]) $content[refs] $content[points] $content[last_online]$content[cnt]$content[userid]($content[nickname])$content[refs]$content[points]$content[last_online]
    Impressum
     
     Ihr Name hier!
    - Ihre Strasse
    - XX-12345 Demo-Dorf
    -
    - Tel.: +49(0)-123-456789
    -
    - Email: {?WEBMASTER?}
    -
    +     		+
    + Ihr Name hier!
    + Ihre Strasse
    + XX-12345 Demo-Dorf +
    + +
    + Tel.: +49(0)-123-456789 +
    + +
    + Email: {?WEBMASTER?} +
    		 
     
    diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index d80792fd5e..fbf144edea 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -1,14 +1,15 @@ +
    - - - + @@ -31,9 +32,10 @@ -
    +
    {--HEADER_TEXT_PAGE1--}
    - {--TEXT_PAGE_1--} + {--TEXT_PAGE_1--} +
    {--SERVER_PATH--}:
    +
    +
    diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 95a5c5c111..9ca1743d55 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -1,7 +1,8 @@ +
    - @@ -11,26 +12,26 @@ - - + - - + - - + - - + - - + - - + - - + -
    +
    {--HEADER_TEXT_PAGE2--}
    {--MYSQL_HOST--}: + {--MYSQL_HOST--}:
    {--MYSQL_DBASE--}: + {--MYSQL_DBASE--}:
    {--MYSQL_PREFIX--}: + {--MYSQL_PREFIX--}:
    {--MYSQL_TABLE_TYPE--}: + {--MYSQL_TABLE_TYPE--}:
    {--MYSQL_LOGIN--}: + {--MYSQL_LOGIN--}:
    {--MYSQL_PASS1--}: + {--MYSQL_PASS1--}:
    {--MYSQL_PASS2--}: + {--MYSQL_PASS2--}:
    + @@ -67,3 +68,4 @@
    +
    \ No newline at end of file diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 6cf4560d0a..8f9d5384ec 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -6,48 +6,49 @@ - - {--TEXT_PAGE_3--} + + {--TEXT_PAGE_3--} + - {--TEXT_SMTP_HOST--}: - - + {--TEXT_SMTP_HOST--}: + + - {--TEXT_SMTP_USER--}: - - + {--TEXT_SMTP_USER--}: + + - {--TEXT_SMTP_PASS1--}: - - + {--TEXT_SMTP_PASS1--}: + + - {--TEXT_SMTP_PASS2--}: - - + {--TEXT_SMTP_PASS2--}: + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/templates/de/html/install/install_page5.tpl b/templates/de/html/install/install_page5.tpl index 0ca877474c..01365379af 100644 --- a/templates/de/html/install/install_page5.tpl +++ b/templates/de/html/install/install_page5.tpl @@ -1,64 +1,65 @@ +
    - + - + - - + + - - + + - - + + - - + + - +
    -
    {--HEADER_TEXT_PAGE5--}
    -     		+
    {--HEADER_TEXT_PAGE5--}
    +
    - {--TEXT_PAGE_5--} - + {--TEXT_PAGE_5--}
    {--LANG_OUTPUT_MODE--}: - - {--LANG_OUTPUT_MODE--}: + +
    {--WARN_NO_PASSWORD--}: - - {--WARN_NO_PASSWORD--}: + +
    {--LANG_WRITE_FOOTER--}: - - {--LANG_WRITE_FOOTER--}: + +
    {--INSTALL_ENABLE_BACKLINK--}: - - {--INSTALL_ENABLE_BACKLINK--}: + +
    - $content[mysql_hidden] - - - - - - - - - - + $content[mysql_hidden] + + + + + + + + + +
    +
    diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl index d585ea915e..9e0a8e4957 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -23,14 +23,14 @@ function StartCounter() {
    - +
    - {--MEMBER_TIME_COUNTER_1--} {--_SECONDS--} - {--MEMBER_TIME_COUNTER_2--}
    + {--MEMBER_TIME_COUNTER_1--} + + {--_SECONDS--} {--MEMBER_TIME_COUNTER_2--} +
    diff --git a/templates/de/html/member/member_doubler_list.tpl b/templates/de/html/member/member_doubler_list.tpl index 7dece04143..cbb5718f64 100644 --- a/templates/de/html/member/member_doubler_list.tpl +++ b/templates/de/html/member/member_doubler_list.tpl @@ -1,16 +1,22 @@ + {--_UID--} + + {--REF_UID--} + - + $content - + -
    - {--_UID--} - {--REF_UID--} - {?POINTS?}{--DOUBLER_TIMEMARK--} + {?POINTS?} + + {--DOUBLER_TIMEMARK--}
      + {--MEMBER_DOUBLER_FOOTER--} +
    \ No newline at end of file +
    diff --git a/templates/de/html/member/member_header.tpl b/templates/de/html/member/member_header.tpl index 194851b451..666381efa1 100644 --- a/templates/de/html/member/member_header.tpl +++ b/templates/de/html/member/member_header.tpl @@ -13,13 +13,19 @@ -
      Hallo $username!
    +
    + Hallo $username! +
    -
    {?SLOGAN?}
    +
    + {?SLOGAN?} +
    -
    $content[date_time]  
    +
    + $content[date_time] +
    diff --git a/templates/de/html/member/member_holiday_deactivate.tpl b/templates/de/html/member/member_holiday_deactivate.tpl index c4493f3358..8b977828da 100644 --- a/templates/de/html/member/member_holiday_deactivate.tpl +++ b/templates/de/html/member/member_holiday_deactivate.tpl @@ -1,53 +1,34 @@ +
    - - - - - - - - - - + + - - - - - - - + + - - - - - - - - - - -
    {--HOLIDAY_MEMBER_DEACTIVATE_TITLE--}
     
    {--HOLIDAY_MEMBER_TSTART--}: $content[start]
     {--HOLIDAY_MEMBER_TSTART--}:$content[start]
    {--HOLIDAY_MEMBER_TEND--}:  $content[end]
     
    {--HOLIDAY_MEMBER_TLOCK--}: $content[lock]{--HOLIDAY_MEMBER_TLOCK--}:$content[lock]
     
     
    +
    {--HOLIDAY_DEACTIVATE_NOTES--}
     
    +
    +
    diff --git a/templates/de/html/member/member_holiday_form.tpl b/templates/de/html/member/member_holiday_form.tpl index a2def63e00..ae85e4dab6 100644 --- a/templates/de/html/member/member_holiday_form.tpl +++ b/templates/de/html/member/member_holiday_form.tpl @@ -2,13 +2,13 @@
    - - - + @@ -30,7 +30,7 @@ - diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index 60173f76ae..b65a6ebc0f 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -2,7 +2,7 @@
    + {--HOLIDAY_MEMBER_TITLE--}
    {--HOLIDAY_MEMBER_TSTART--}: + {--HOLIDAY_MEMBER_TSTART--}: $content[start_day].$content[start_month].$content[start_year]
    + {--HOLIDAY_NOTES--}
    - @@ -10,10 +10,10 @@ - - diff --git a/templates/de/html/member/member_menu_whats.tpl b/templates/de/html/member/member_menu_whats.tpl index 3c21927bc2..8295fcb4dd 100644 --- a/templates/de/html/member/member_menu_whats.tpl +++ b/templates/de/html/member/member_menu_whats.tpl @@ -1,3 +1,6 @@ - - \ No newline at end of file + + diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index af98d904e3..f85da42bfe 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -1,73 +1,60 @@
    -
    + {--MEMBER_HTML_INTRO--}
    {--MEMBER_HTML_TEXT--}
    + {--YES--}:  + {--NO--}: 
     ·  $content
    + · + $content +
    +
    - + - - - + + - - - + + - - - + + - - - - - - - - - - + - - - - - - + +
    $content[change] + $content[change] +
    {--YOUR_LOGIN--}: $content[userid]{--YOUR_LOGIN--}:$content[userid]
    {--GENDER--}: $content[gender]{--GENDER--}:$content[gender]
    {--SURNAME--}: $content[surname]{--SURNAME--}:$content[surname]
    {--FAMILY--}:  $content[family]
    {--STREET_NR--}:  $content[street_nr]
    {--COUNTRY--}:  $content[country]
    {--ZIP--}:  $content[zip]
    {--CITY--}:  $content[city]
    {--EMAIL--}:  $content[email]
    {--BIRTHDAY--}:  $content[dob]
    {--MAILS_PER_DAY--}:  + {--MAILS_PER_DAY--}: $content[max_mails] ({--TODAY--}: $content[receive_mails])
    {--PROFILE_LAST_CHANGE--}: $content[last_update]
    $content[change]{--PROFILE_LAST_CHANGE--}:$content[last_update]
    diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index af97857625..b6cc5e05c3 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -2,7 +2,7 @@ - diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl index e3575e2ecf..20f40ddb7f 100644 --- a/templates/de/html/member/member_order-html_intro.tpl +++ b/templates/de/html/member/member_order-html_intro.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/member/member_order-zip1.tpl b/templates/de/html/member/member_order-zip1.tpl index 095f9f2580..b4a87a6ecb 100644 --- a/templates/de/html/member/member_order-zip1.tpl +++ b/templates/de/html/member/member_order-zip1.tpl @@ -1,5 +1,5 @@ - @@ -25,8 +25,8 @@ - - + diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl index 84ab8cf75d..346ca1214e 100644 --- a/templates/de/html/member/member_order-zip2.tpl +++ b/templates/de/html/member/member_order-zip2.tpl @@ -1,5 +1,5 @@ - diff --git a/templates/de/html/member/member_payout.tpl b/templates/de/html/member/member_payout.tpl index f535706d3e..e6b9ec12f1 100644 --- a/templates/de/html/member/member_payout.tpl +++ b/templates/de/html/member/member_payout.tpl @@ -1,7 +1,8 @@
    + {--NICKNAME_CHANGE_NICKNAME_TITLE--}
    + {--MEMBER_HTML_ORDER_INTRO--}
    + {--MEMBER_ORDER_PAGE1_INTRO--}
    {--MEMBER_ENTER_ZIP_CODE--}: + {--MEMBER_ENTER_ZIP_CODE--}:
    + {--MEMBER_ORDER_PAGE2_INTRO--}
    - + @@ -12,6 +13,8 @@ $content - +
    - {--PAYOUT_MEMBER_LIST_PAYOUTS--}: + {--MEMBER_PAYOUT_LIST_TITLE--}: +
    {--PAYOUT_TOTAL_PAYOUT--}
      + {--MEMBER_PAYOUT_LIST_FOOTER--} +
    diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl index 4839f92006..7ca563d9bd 100644 --- a/templates/de/html/member/member_payout_form.tpl +++ b/templates/de/html/member/member_payout_form.tpl @@ -1,7 +1,7 @@ - diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl index a0c9b0d48b..ae3466c032 100644 --- a/templates/de/html/member/member_payout_form_banner.tpl +++ b/templates/de/html/member/member_payout_form_banner.tpl @@ -2,7 +2,7 @@
    + {--PAYOUT_NOW_TITLE--}
    - diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 9a30946bae..1e501e73e6 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -7,21 +7,21 @@ $content[rows] - - - + + + - + - - - + + + $content[special_rows] @@ -30,24 +30,24 @@ - - - + + + - - - + + + - - - + + + - - - + + +
    + {--PAYOUT_NOW_TITLE--}
     {--POINTS_USED--} {%user,used_points,translateComma%} {?POINTS?} {--POINTS_USED--}{%user,used_points,translateComma%} {?POINTS?}
     {--POINTS_SUM--}{--POINTS_SUM--}  $content[sum] {?POINTS?} $content[tref]
     {--POINTS_LOCKED--} $content[tlock] {?POINTS?} {--POINTS_LOCKED--}$content[tlock] {?POINTS?}-
     {--RECEIVED_MAILS--}: $content[receive] {--RECEIVED_MAILS--}:$content[receive]-
     {--UNCONFIRMED_LOCKED--}: {%user,ref_payout%} {--UNCONFIRMED_LOCKED--}:{%user,ref_payout%}-
     {--CONFIRMED_MAILS--}: $content[confirmed] {--CONFIRMED_MAILS--}:$content[confirmed]-
     {--SENT_MAILS--}: $content[sent] {--SENT_MAILS--}:$content[sent]-
    diff --git a/templates/de/html/member/member_points_bonus_rows.tpl b/templates/de/html/member/member_points_bonus_rows.tpl index 6f3f1a864a..9f9fef0189 100644 --- a/templates/de/html/member/member_points_bonus_rows.tpl +++ b/templates/de/html/member/member_points_bonus_rows.tpl @@ -9,32 +9,32 @@ -  {--BONUS_LOGIN_TOTAL--} -  $content[login] {?POINTS?} -   + {--BONUS_LOGIN_TOTAL--} + $content[login] {?POINTS?} + -  {--BONUS_TURBO_TOTAL--} -  $content[turbo] {?POINTS?} -   + {--BONUS_TURBO_TOTAL--} + $content[turbo] {?POINTS?} + - -  {--BONUS_REF_TOTAL--} -  $content[ref] {?POINTS?} -   + {--BONUS_REF_TOTAL--} + $content[ref] {?POINTS?} + - -  {--BONUS_ORDER_TOTAL--} -  $content[order] {?POINTS?} -   + {--BONUS_ORDER_TOTAL--} + $content[order] {?POINTS?} + - -  {--BONUS_STATS_TOTAL--} -  $content[stats] {?POINTS?} -   + {--BONUS_STATS_TOTAL--} + $content[stats] {?POINTS?} + - -  {--BONUS_TOTAL--} -  $content[ttotal] {?POINTS?} -   + {--BONUS_TOTAL--} + $content[ttotal] {?POINTS?} + - diff --git a/templates/de/html/member/member_points_row.tpl b/templates/de/html/member/member_points_row.tpl index b0d4eb0772..4558bc8637 100644 --- a/templates/de/html/member/member_points_row.tpl +++ b/templates/de/html/member/member_points_row.tpl @@ -1,5 +1,5 @@ -  $content[level] {--REF_LEVEL--} ($content[percents]%) -  $content[points] {?POINTS?} + $content[level] {--REF_LEVEL--} ($content[percents]%) + $content[points] {?POINTS?} $content[refs] diff --git a/templates/de/html/member/member_primera_mode_list.tpl b/templates/de/html/member/member_primera_mode_list.tpl index 269d8f707c..fd2a5ddcb6 100644 --- a/templates/de/html/member/member_primera_mode_list.tpl +++ b/templates/de/html/member/member_primera_mode_list.tpl @@ -1,14 +1,14 @@ - - + $content[rows] diff --git a/templates/de/html/member/member_primera_mode_pay.tpl b/templates/de/html/member/member_primera_mode_pay.tpl index 94b6acf4da..1bda8e58a4 100644 --- a/templates/de/html/member/member_primera_mode_pay.tpl +++ b/templates/de/html/member/member_primera_mode_pay.tpl @@ -1,42 +1,41 @@ +
    - {--PRIMERA_MEMBER_LIST_PRIMERA--} + + {--MEMBER_PRIMERA_LIST_PRIMERA--}
    {--PRIMERA_TOTAL_PRIMERA--} {--PRIMERA_ACCOUNT--} {--PRIMERA_TIMESTAMP--}{--PRIMERA_MEMBER_STATUS--}{--MEMBER_PRIMERA_STATUS--}
    - - - - + + - - - + + - - - + + - - - + + - - - + + -
    - {--PRIMERA_MEMBER_PAYOUT_TITLE--} + + {--MEMBER_PRIMERA_PAYOUT_TITLE--}
    {--PRIMERA_MEMBER_PAYOUT_POINTS--} $content[points] Primera{--MEMBER_PRIMERA_PAYOUT_POINTS--}$content[points] Primera
    {--PRIMERA_MEMBER_PAYOUT_MIN_POINTS--} {%config,translateComma=primera_min_payout%} Primera{--MEMBER_PRIMERA_PAYOUT_MIN_POINTS--}{%config,translateComma=primera_min_payout%} Primera
    {--PRIMERA_MEMBER_NICKNAME--} {--MEMBER_PRIMERA_NICKNAME--}
    {--PRIMERA_MEMBER_PASSWORD--} {--MEMBER_PRIMERA_PASSWORD--}
    {--PRIMERA_MEMBER_AMOUNT--} {--MEMBER_PRIMERA_AMOUNT--}
    + - +
    -
    {--PRIMERA_MEMBER_PAYOUT_NOTE--}
    +
    + {--MEMBER_PRIMERA_PAYOUT_NOTE--} +
    + diff --git a/templates/de/html/member/member_profile_outdated.tpl b/templates/de/html/member/member_profile_outdated.tpl index f957a57b4b..55b9e0060f 100644 --- a/templates/de/html/member/member_profile_outdated.tpl +++ b/templates/de/html/member/member_profile_outdated.tpl @@ -1,3 +1,4 @@ +
    - -
    @@ -24,15 +25,16 @@
    +
    		+
    +
    diff --git a/templates/de/html/member/member_reflinks_row.tpl b/templates/de/html/member/member_reflinks_row.tpl index 0928786a35..4b03539373 100644 --- a/templates/de/html/member/member_reflinks_row.tpl +++ b/templates/de/html/member/member_reflinks_row.tpl @@ -1,5 +1,4 @@ -  
    $content[alternate] @@ -9,21 +8,11 @@ $content[clicks] {--REF_CLIX--}
    -   -   - - -  
    <a href="{?URL?}/click.php?user=$content[userid]&banner=$content[id]" target="_blank"><img src="{?URL?}/view.php?user=$content[userid]&banner=$content[id]" alt="$content[alternate]" title="$content[alternate]" border="0" /></a>
    -   - - -   diff --git a/templates/de/html/member/member_reflinks_table.tpl b/templates/de/html/member/member_reflinks_table.tpl index 7fc4f01011..eaf829c186 100644 --- a/templates/de/html/member/member_reflinks_table.tpl +++ b/templates/de/html/member/member_reflinks_table.tpl @@ -1,5 +1,10 @@
    $content + + +
    + {--MEMBER_REFLINKS_FOOTER--} +
    diff --git a/templates/de/html/member/member_surfbar_book_dynamic.tpl b/templates/de/html/member/member_surfbar_book_dynamic.tpl index d5a9bc9b24..02303572aa 100644 --- a/templates/de/html/member/member_surfbar_book_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_book_dynamic.tpl @@ -1,6 +1,6 @@
    -
    +
    URL in Surfbar buchen - Dynamisch:
    @@ -28,7 +28,7 @@ $content[max_order] erlaubten URLs gebucht.
    -
    +
    diff --git a/templates/de/html/member/member_surfbar_book_static.tpl b/templates/de/html/member/member_surfbar_book_static.tpl index 70445dd72f..a3ff48073c 100644 --- a/templates/de/html/member/member_surfbar_book_static.tpl +++ b/templates/de/html/member/member_surfbar_book_static.tpl @@ -1,6 +1,6 @@
    -
    +
    URL in Surfbar buchen - Statisch:
    @@ -28,7 +28,7 @@ $content[max_order] erlaubten URLs gebucht.
    -
    +
    diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl index d4e36d9324..a0cb46aee7 100644 --- a/templates/de/html/member/member_surfbar_delete_action_form.tpl +++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl @@ -1,6 +1,6 @@
    -
    +
    URL in Surfbar löschen:
    @@ -20,7 +20,7 @@ Aufrufe begrenzt auf: $content[views_max] (0=Unbegrenzt)
    -
    +
    diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index f0708cbedb..ef46ee67f8 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -1,6 +1,6 @@
    -
    +
    URL in Surfbar editieren:
    @@ -18,7 +18,7 @@ Aufrufe begrenzen auf:
    -
    +
    diff --git a/templates/de/html/member/member_surfbar_link.tpl b/templates/de/html/member/member_surfbar_link.tpl index 548cb5d790..0da2183867 100644 --- a/templates/de/html/member/member_surfbar_link.tpl +++ b/templates/de/html/member/member_surfbar_link.tpl @@ -1,3 +1,3 @@ -
    +
    »» Jetzt die Surfbar starten! ««
    diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl index d57cd41177..6d280ad67f 100644 --- a/templates/de/html/member/member_surfbar_start_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl @@ -1,5 +1,5 @@
    -
    +
    Dynamisch vergütete Surfbar ist aktiv
    diff --git a/templates/de/html/member/member_surfbar_start_static.tpl b/templates/de/html/member/member_surfbar_start_static.tpl index c8a7c50935..dca3388c0e 100644 --- a/templates/de/html/member/member_surfbar_start_static.tpl +++ b/templates/de/html/member/member_surfbar_start_static.tpl @@ -1,5 +1,5 @@
    -
    +
    Statisch vergütete Surfbar ist aktiv
    diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl index bfb391b07c..a7e091ab0d 100644 --- a/templates/de/html/member/member_transfer_list.tpl +++ b/templates/de/html/member/member_transfer_list.tpl @@ -1,7 +1,7 @@
    - diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 1b9cd6ba60..91c141206d 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -1,12 +1,11 @@ +
    + $content[title]
    - - - - @@ -14,16 +13,14 @@ - - - + - - - - @@ -43,25 +38,24 @@ - - - + - - -
    + {--TRANSFER_SELECT_TARGET_UID--}:    + $content[userid_selection]
    {--TRANSFER_POINTS_MAXIMUM--}:   $content[max_transferable] {?POINTS?} + $content[max_transferable] {?POINTS?} +
    {--TRANSFER_POINTS_AMOUNT--}:    {?POINTS?} @@ -33,8 +30,6 @@ {--TRANSFER_POINTS_REASON--}:    {--TRANSFER_POINTS_SECURITY_CODE--}:   $content[captcha_code] + $content[captcha_code] +
    {--TRANSFER_ENTER_PASSWORD--}:   
    +
    +
    diff --git a/templates/de/html/member/member_wernis_mode_choose.tpl b/templates/de/html/member/member_wernis_mode_choose.tpl index 1249f4d276..28cdf15006 100644 --- a/templates/de/html/member/member_wernis_mode_choose.tpl +++ b/templates/de/html/member/member_wernis_mode_choose.tpl @@ -1,19 +1,19 @@
    - - -
    + {--MEMBER_WERNIS_MODE_CHOOSE--}
    + $content[withdraw_link] + $content[payout_link]
    -{--WERNIS_MEMBER_NO_ACCOUNT--} +{--MEMBER_WERNIS_NO_ACCOUNT--}
    diff --git a/templates/de/html/member/member_wernis_mode_list.tpl b/templates/de/html/member/member_wernis_mode_list.tpl index c4bb1fcdbb..469ced9804 100644 --- a/templates/de/html/member/member_wernis_mode_list.tpl +++ b/templates/de/html/member/member_wernis_mode_list.tpl @@ -1,14 +1,14 @@ - - + $content[rows] diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index 2818a23db1..a38334c14c 100644 --- a/templates/de/html/member/member_wernis_mode_payout.tpl +++ b/templates/de/html/member/member_wernis_mode_payout.tpl @@ -1,52 +1,43 @@ +
    - {--WERNIS_MEMBER_LIST_WERNIS--} + + {--MEMBER_WERNIS_LIST_WERNIS--}
    {--WERNIS_TOTAL_WERNIS--} {--WERNIS_ACCOUNT--} {--WERNIS_TIMESTAMP--}{--WERNIS_MEMBER_STATUS--}{--MEMBER_WERNIS_STATUS--}
    - - - - - - - - - - - + - + + - - - + + - - - + + - - - + + - + + -
    {--WERNIS_MEMBER_PAYOUT_TITLE--}
    {--WERNIS_MEMBER_PAYOUT_POINTS--} $content[points] Wernis
    {--WERNIS_MEMBER_PAYOUT_MIN_POINTS--} {%config,translateComma=wernis_min_payout%} Wernis + {--MEMBER_WERNIS_PAYOUT_TITLE--} +
     {--MEMBER_WERNIS_PAYOUT_POINTS--}$content[points] Wernis
    {--WERNIS_MEMBER_WDS66_ID--} {--MEMBER_WERNIS_PAYOUT_MIN_POINTS--}{%config,translateComma=wernis_min_payout%} Wernis
    {--WERNIS_MEMBER_WDS66_PASSWORD--} {--MEMBER_WERNIS_WDS66_ID--}
    {--WERNIS_MEMBER_WDS66_AMOUNT--} {--MEMBER_WERNIS_WDS66_PASSWORD--}
     {--MEMBER_WERNIS_WDS66_AMOUNT--}
    + - +
    +
    - {--WERNIS_MEMBER_PAYOUT_NOTE--} + {--MEMBER_WERNIS_PAYOUT_NOTE--}
    -
    Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit {%config,translateComma=wernis_payout_factor%}:1. @@ -55,3 +46,4 @@ oder um einen fixen Betrag von {%config,translateComma=wernis_payout_fee_fix%} {?POINTS?} bereits reduziert.
    +
    diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index 935959dcc7..f0a9a79f37 100644 --- a/templates/de/html/member/member_wernis_mode_withdraw.tpl +++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl @@ -1,50 +1,41 @@ +
    - - - - + + - - - + + - + + - - - + + - - - + + - - - - - - - - -
    - {--WERNIS_MEMBER_WITHDRAW_TITLE--} + + {--MEMBER_WERNIS_WITHDRAW_TITLE--}
    {--WERNIS_MEMBER_WITHDRAW_POINTS_ACCOUNT--} $content[points] Wernis{--MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT--}$content[points] Wernis
    {--WERNIS_MEMBER_WITHDRAW_MIN_POINTS--} {%config,translateComma=wernis_min_withdraw%} Wernis{--MEMBER_WERNIS_WITHDRAW_MIN_POINTS--}{%config,translateComma=wernis_min_withdraw%} Wernis
     {--MEMBER_WERNIS_WDS66_ID--}
    {--WERNIS_MEMBER_WDS66_ID--} {--MEMBER_WERNIS_WDS66_PASSWORD--}
    {--WERNIS_MEMBER_WDS66_PASSWORD--} {--MEMBER_WERNIS_WDS66_AMOUNT--}
    {--WERNIS_MEMBER_WDS66_AMOUNT--} 
     
    + - +
    - {--WERNIS_MEMBER_WITHDRAW_NOTE--} + {--MEMBER_WERNIS_WITHDRAW_NOTE--} +
    diff --git a/templates/de/html/sponsor/sponsor_main.tpl b/templates/de/html/sponsor/sponsor_main.tpl index 7b56b346ec..22db50212f 100644 --- a/templates/de/html/sponsor/sponsor_main.tpl +++ b/templates/de/html/sponsor/sponsor_main.tpl @@ -6,7 +6,7 @@ - + $content[menu] diff --git a/templates/de/html/sponsor/sponsor_what.tpl b/templates/de/html/sponsor/sponsor_what.tpl index 5cffc4cb10..d493cc88bf 100644 --- a/templates/de/html/sponsor/sponsor_what.tpl +++ b/templates/de/html/sponsor/sponsor_what.tpl @@ -1,5 +1,6 @@ - -  · $content[title] - + + · + $content[title] + diff --git a/templates/de/html/surfbar/surfbar_frame_start.tpl b/templates/de/html/surfbar/surfbar_frame_start.tpl index b66e98d6a2..d3a7126747 100644 --- a/templates/de/html/surfbar/surfbar_frame_start.tpl +++ b/templates/de/html/surfbar/surfbar_frame_start.tpl @@ -1,6 +1,6 @@
    -
    +
    {?POINTS?}-Surfbar von {?MAIN_TITLE?}
    @@ -13,7 +13,7 @@
    -
    +
    Tipp von uns:
    diff --git a/templates/de/html/surfbar/surfbar_login_form.tpl b/templates/de/html/surfbar/surfbar_login_form.tpl index 1744d8325f..dc2ce879f3 100644 --- a/templates/de/html/surfbar/surfbar_login_form.tpl +++ b/templates/de/html/surfbar/surfbar_login_form.tpl @@ -1,47 +1,26 @@
    - + - - - - - - - - - - - - - + - - - - + - - - - - - - - - -
    diff --git a/templates/de/html/surfbar/surfbar_stopped.tpl b/templates/de/html/surfbar/surfbar_stopped.tpl index 429f701a0a..0631f355b1 100644 --- a/templates/de/html/surfbar/surfbar_stopped.tpl +++ b/templates/de/html/surfbar/surfbar_stopped.tpl @@ -1,6 +1,6 @@
    -
    +
    Surfbar angehalten!
    -- 2.39.5