More HTML swapped and admin contact link rewritten. Resolves #91

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 853b4870b9a10e9cf2601cb35fc93f3351e350cf..73ea2da18d262c759e54ec15cb654f64377dab17 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -87,12 +87,18 @@ inc/autopurge/purge-mails.php -text
 inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
+inc/cache/.revision -text
 inc/check-reset.php -text
 inc/config.php -text
 inc/databases.php -text
 inc/db/.htaccess -text
 inc/db/lib-mysql3.php -text
 inc/db/lib.php -text
+inc/debug/.htaccess -text
+inc/debug/client/.htaccess -text
+inc/debug/relay/.htaccess -text
+inc/debug/request_ -text
+inc/debug/server/.htaccess -text
 inc/doubler_send.php -text
 inc/extensions.php -text
 inc/extensions/.htaccess -text
@@ -106,18 +112,23 @@ inc/extensions/ext-bank.php -text
 inc/extensions/ext-beg.php -text
 inc/extensions/ext-birthday.php -text
 inc/extensions/ext-bonus.php -text
+inc/extensions/ext-booking.php -text
 inc/extensions/ext-cache.php -text
 inc/extensions/ext-country.php -text
 inc/extensions/ext-debug.php -text
 inc/extensions/ext-demo.php -text
 inc/extensions/ext-doubler.php -text
+inc/extensions/ext-events.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-iso3166.php -text
+inc/extensions/ext-logs.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
 inc/extensions/ext-mods.php -text
 inc/extensions/ext-mydata.php -text
+inc/extensions/ext-network.php -text
 inc/extensions/ext-newsletter.php -text
 inc/extensions/ext-nickname.php -text
 inc/extensions/ext-online.php -text
@@ -142,10 +153,12 @@ inc/extensions/ext-task.php -text
 inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
+inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
 inc/extensions/ext-yoomedia.php -text
 inc/fatal_errors.php -text
+inc/filters.php -text
 inc/footer.php -text
 inc/functions.php -text
 inc/gen_mediadata.php -text
@@ -157,6 +170,7 @@ inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/language.php -text
 inc/language/.htaccess -text
+inc/language/_de.php -text
 inc/language/active_de.php -text
 inc/language/admins_de.php -text
 inc/language/autopurge_de.php -text
@@ -164,6 +178,7 @@ inc/language/bank_de.php -text
 inc/language/beg_de.php -text
 inc/language/birthday_de.php -text
 inc/language/bonus_de.php -text
+inc/language/booking_de.php -text
 inc/language/cache_de.php -text
 inc/language/country_de.php -text
 inc/language/de.php -text
@@ -174,6 +189,7 @@ inc/language/en.php -text
 inc/language/holiday_de.php -text
 inc/language/html_mail_de.php -text
 inc/language/install_de.php -text
+inc/language/logs_de.php -text
 inc/language/mailid_de.php -text
 inc/language/maintenance_de.php -text
 inc/language/mediadata_de.php -text
@@ -199,23 +215,28 @@ inc/language/task_de.php -text
 inc/language/theme_de.php -text
 inc/language/top10_de.php -text
 inc/language/transfer_de.php -text
+inc/language/usage_de.php -text
 inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
+inc/libs/active_functions.php -text
 inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
 inc/libs/beg_functions.php -text
 inc/libs/bonus_functions.php -text
+inc/libs/booking_functions.php -text
 inc/libs/cache_functions.php -text
 inc/libs/country_functions.php -text
 inc/libs/debug_functions.php -text
 inc/libs/doubler_functions.php -text
+inc/libs/events_functions.php -text
 inc/libs/holiday_functions.php -text
 inc/libs/html_mail_functions.php -text
 inc/libs/mediadata_functions.php -text
 inc/libs/newsletter_functions.php -text
 inc/libs/nickname_functions.php -text
+inc/libs/online_functions.php -text
 inc/libs/optimize_functions.php -text
 inc/libs/order_functions.php -text
 inc/libs/payout_functions.php -text
@@ -229,6 +250,7 @@ inc/libs/security_functions.php -text
 inc/libs/sponsor_functions.php -text
 inc/libs/surfbar_functions.php -text
 inc/libs/task_functions.php -text
+inc/libs/theme_functions.php -text
 inc/libs/transfer_functions.php -text
 inc/libs/user_functions.php -text
 inc/libs/wernis_functions.php -text
@@ -291,7 +313,6 @@ inc/modules/admin/what-admins_add.php -text
 inc/modules/admin/what-admins_contct.php -text
 inc/modules/admin/what-admins_edit.php -text
 inc/modules/admin/what-admins_mails.php -text
-inc/modules/admin/what-autopurge.php -text
 inc/modules/admin/what-bonus.php -text
 inc/modules/admin/what-cache_stats.php -text
 inc/modules/admin/what-chk_regs.php -text
@@ -322,7 +343,6 @@ inc/modules/admin/what-config_proxy.php -text
 inc/modules/admin/what-config_rallye_prices.php -text
 inc/modules/admin/what-config_refback.php -text
 inc/modules/admin/what-config_refid.php -text
-inc/modules/admin/what-config_reg.php -text
 inc/modules/admin/what-config_register.php -text
 inc/modules/admin/what-config_register2.php -text
 inc/modules/admin/what-config_removeip.php -text
@@ -365,7 +385,6 @@ inc/modules/admin/what-list_doubler.php -text
 inc/modules/admin/what-list_holiday.php -text
 inc/modules/admin/what-list_links.php -text
 inc/modules/admin/what-list_newsletter.php -text
-inc/modules/admin/what-list_norefs.php -text
 inc/modules/admin/what-list_notifications.php -text
 inc/modules/admin/what-list_payouts.php -text
 inc/modules/admin/what-list_primera.php -text
@@ -576,6 +595,9 @@ inc/phpmailer/test/phpmailer_test.php -text
 inc/phpmailer/test/phpunit.php -text
 inc/phpmailer/test/test.png -text
 inc/pool-update.php -text
+inc/pool/.htaccess -text
+inc/pool/pool-bonus.php -text
+inc/pool/pool-user.php -text
 inc/profile-updte.php -text
 inc/rdf.class.php -text
 inc/reset/.htaccess -text
@@ -592,7 +614,6 @@ inc/session.php -text
 inc/sql_error.php -text
 inc/stats_bonus.php -text
 inc/stylesheet.php -text
-inc/theme-manager.php -text
 inc/weekly/.htaccess -text
 inc/weekly/weekly_ -text
 inc/weekly/weekly_surfbar.php -text
@@ -615,8 +636,10 @@ install/tables.sql -text
 /surfbar.php -text
 templates/.htaccess -text
 templates/de/.htaccess -text
+templates/de/emails/.htaccess -text
 templates/de/emails/add-points.tpl -text
 templates/de/emails/admin-del_links.tpl -text
+templates/de/emails/admin/.htaccess -text
 templates/de/emails/admin/admin_autopurge_del_mails.tpl -text
 templates/de/emails/admin/admin_autopurge_delete.tpl -text
 templates/de/emails/admin/admin_autopurge_inactive.tpl -text
@@ -626,10 +649,11 @@ templates/de/emails/admin/admin_autopurge_turbo.tpl -text
 templates/de/emails/admin/admin_autopurge_unconfirmed.tpl -text
 templates/de/emails/admin/admin_del_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl -text
+templates/de/emails/admin/admin_ext_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_deactivated.tpl -text
 templates/de/emails/admin/admin_holiday_request.tpl -text
 templates/de/emails/admin/admin_holiday_unlock.tpl -text
-templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl -text
 templates/de/emails/admin/admin_mydata_notify.tpl -text
 templates/de/emails/admin/admin_newsletter_request.tpl -text
@@ -649,16 +673,27 @@ templates/de/emails/admin/admin_sponsor_edit.tpl -text
 templates/de/emails/admin/admin_sponsor_pending.tpl -text
 templates/de/emails/admin/admin_sponsor_reg.tpl -text
 templates/de/emails/admin/admin_sponsor_settings.tpl -text
-templates/de/emails/admin/admin_support-order.tpl -text
 templates/de/emails/admin/admin_support-ordr.tpl -text
 templates/de/emails/admin/admin_support-reflink.tpl -text
 templates/de/emails/admin/admin_support-unconfirmed.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_pending.tpl -text
+templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl -text
 templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text
 templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending.tpl -text
+templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/admin/admin_surfbar_url_reg.tpl -text
 templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl -text
+templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text
 templates/de/emails/admin/admin_transfer_ap.tpl -text
 templates/de/emails/admin/admin_transfer_points.tpl -text
@@ -686,10 +721,12 @@ templates/de/emails/del-user.tpl -text
 templates/de/emails/del_sponsor.tpl -text
 templates/de/emails/done-admin.tpl -text
 templates/de/emails/done-member.tpl -text
+templates/de/emails/guest/.htaccess -text
 templates/de/emails/guest/guest_request_confirm.tpl -text
 templates/de/emails/header.tpl -text
 templates/de/emails/lock-user.tpl -text
 templates/de/emails/lock_sponsor.tpl -text
+templates/de/emails/member/.htaccess -text
 templates/de/emails/member/member_autopurge_delete.tpl -text
 templates/de/emails/member/member_autopurge_inactive.tpl -text
 templates/de/emails/member/member_autopurge_points.tpl -text
@@ -706,7 +743,7 @@ templates/de/emails/member/member_holiday_activated.tpl -text
 templates/de/emails/member/member_holiday_removed.tpl -text
 templates/de/emails/member/member_holiday_request.tpl -text
 templates/de/emails/member/member_holiday_unlock.tpl -text
-templates/de/emails/member/member_lock_confirmed_surfbar_urls.tpl -text
+templates/de/emails/member/member_lock_active_surfbar_urls.tpl -text
 templates/de/emails/member/member_lock_locked_surfbar_urls.tpl -text
 templates/de/emails/member/member_mydata_notify.tpl -text
 templates/de/emails/member/member_newsletter_done.tpl -text
@@ -723,17 +760,28 @@ templates/de/emails/member/member_rallye_expired_silver.tpl -text
 templates/de/emails/member/member_rallye_notify.tpl -text
 templates/de/emails/member/member_refback.tpl -text
 templates/de/emails/member/member_stats_bonus.tpl -text
-templates/de/emails/member/member_support-order.tpl -text
 templates/de/emails/member/member_support-ordr.tpl -text
 templates/de/emails/member/member_support-reflink.tpl -text
 templates/de/emails/member/member_support-unconfirmed.tpl -text
 templates/de/emails/member/member_surfbar_low_points.tpl -text
+templates/de/emails/member/member_surfbar_url_active_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_active_pending.tpl -text
+templates/de/emails/member/member_surfbar_url_active_stopped.tpl -text
 templates/de/emails/member/member_surfbar_url_confirmed.tpl -text
 templates/de/emails/member/member_surfbar_url_depleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_migrate.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text
+templates/de/emails/member/member_surfbar_url_migrated_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending.tpl -text
+templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text
 templates/de/emails/member/member_surfbar_url_reg.tpl -text
 templates/de/emails/member/member_surfbar_url_rejected.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_continued.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl -text
+templates/de/emails/member/member_surfbar_url_stopped_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_unlock.tpl -text
 templates/de/emails/member/member_transfer_recipient.tpl -text
 templates/de/emails/member/member_transfer_sender.tpl -text
@@ -753,6 +801,7 @@ templates/de/emails/order-reject.tpl -text
 templates/de/emails/profile-updte.tpl -text
 templates/de/emails/register-admin.tpl -text
 templates/de/emails/register-member.tpl -text
+templates/de/emails/sponsor/.htaccess -text
 templates/de/emails/sponsor/sponsor_activate.tpl -text
 templates/de/emails/sponsor/sponsor_add_points.tpl -text
 templates/de/emails/sponsor/sponsor_change_data.tpl -text
@@ -878,7 +927,6 @@ templates/de/html/admin/admin_config_user.tpl -text
 templates/de/html/admin/admin_config_wernis.tpl -text
 templates/de/html/admin/admin_config_yoomedia.tpl -text
 templates/de/html/admin/admin_contct_user_form.tpl -text
-templates/de/html/admin/admin_data_saved.tpl -text
 templates/de/html/admin/admin_del_admins.tpl -text
 templates/de/html/admin/admin_del_admins_row.tpl -text
 templates/de/html/admin/admin_del_bank_packages.tpl -text
@@ -917,7 +965,10 @@ templates/de/html/admin/admin_edit_user.tpl -text
 templates/de/html/admin/admin_email_archiv.tpl -text
 templates/de/html/admin/admin_email_archiv_row.tpl -text
 templates/de/html/admin/admin_email_nav_row.tpl -text
+templates/de/html/admin/admin_ext_notes.tpl -text
 templates/de/html/admin/admin_ext_reg_form.tpl -text
+templates/de/html/admin/admin_ext_sql_row.tpl -text
+templates/de/html/admin/admin_ext_sql_table.tpl -text
 templates/de/html/admin/admin_extensions.tpl -text
 templates/de/html/admin/admin_extensions_404.tpl -text
 templates/de/html/admin/admin_extensions_delete.tpl -text
@@ -1066,6 +1117,7 @@ templates/de/html/admin/admin_new_ext.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_newsletter_tsk.tpl -text
+templates/de/html/admin/admin_next_link.tpl -text
 templates/de/html/admin/admin_online_footer.tpl -text
 templates/de/html/admin/admin_online_header.tpl -text
 templates/de/html/admin/admin_optimize.tpl -text
@@ -1122,6 +1174,9 @@ templates/de/html/admin/admin_theme_404.tpl -text
 templates/de/html/admin/admin_theme_edit.tpl -text
 templates/de/html/admin/admin_theme_edit_row.tpl -text
 templates/de/html/admin/admin_theme_import.tpl -text
+templates/de/html/admin/admin_theme_import_form.tpl -text
+templates/de/html/admin/admin_theme_import_none.tpl -text
+templates/de/html/admin/admin_theme_import_row.tpl -text
 templates/de/html/admin/admin_theme_installed.tpl -text
 templates/de/html/admin/admin_theme_list.tpl -text
 templates/de/html/admin/admin_undelete_surfbar_urls.tpl -text
@@ -1170,18 +1225,22 @@ templates/de/html/ext/ext_bank.tpl -text
 templates/de/html/ext/ext_beg.tpl -text
 templates/de/html/ext/ext_birthday.tpl -text
 templates/de/html/ext/ext_bonus.tpl -text
+templates/de/html/ext/ext_booking.tpl -text
 templates/de/html/ext/ext_cache.tpl -text
 templates/de/html/ext/ext_country.tpl -text
 templates/de/html/ext/ext_debug.tpl -text
 templates/de/html/ext/ext_demo.tpl -text
 templates/de/html/ext/ext_doubler.tpl -text
+templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
+templates/de/html/ext/ext_logs.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
 templates/de/html/ext/ext_maintenance.tpl -text
 templates/de/html/ext/ext_mediadata.tpl -text
 templates/de/html/ext/ext_mods.tpl -text
 templates/de/html/ext/ext_mydata.tpl -text
+templates/de/html/ext/ext_network.tpl -text
 templates/de/html/ext/ext_newsletter.tpl -text
 templates/de/html/ext/ext_nickname.tpl -text
 templates/de/html/ext/ext_online.tpl -text
@@ -1206,6 +1265,7 @@ templates/de/html/ext/ext_task.tpl -text
 templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
+templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
 templates/de/html/ext/ext_yoomedia.tpl -text
@@ -1270,6 +1330,7 @@ templates/de/html/index.tpl -text
 templates/de/html/index_forward.tpl -text
 templates/de/html/infos.tpl -text
 templates/de/html/install/.htaccess -text
+templates/de/html/install/install_fatal_errors.tpl -text
 templates/de/html/install/install_fatal_row.tpl -text
 templates/de/html/install/install_fatal_table.tpl -text
 templates/de/html/install/install_finished.tpl -text
@@ -1390,8 +1451,11 @@ templates/de/html/member/member_support_form.tpl -text
 templates/de/html/member/member_surfbar_book_dynamic.tpl -text
 templates/de/html/member/member_surfbar_book_static.tp -text
 templates/de/html/member/member_surfbar_book_static.tpl -text
+templates/de/html/member/member_surfbar_delete_action_form.tpl -text
+templates/de/html/member/member_surfbar_edit_action_form.tpl -text
 templates/de/html/member/member_surfbar_link.tpl -text
 templates/de/html/member/member_surfbar_list.tpl -text
+templates/de/html/member/member_surfbar_list_form.tpl -text
 templates/de/html/member/member_surfbar_list_row.tpl -text
 templates/de/html/member/member_surfbar_start_dynamic.tpl -text
 templates/de/html/member/member_surfbar_start_static.tpl -text
@@ -1455,6 +1519,8 @@ templates/de/html/surfbar/surfbar_frame_top.tpl -text
 templates/de/html/surfbar/surfbar_frameset.tpl -text
 templates/de/html/surfbar/surfbar_start_banner.tpl -text
 templates/de/html/surfbar/surfbar_stopped.tpl -text
+templates/de/html/task/.htaccess -text
+templates/de/html/task/task_ext_deactivated.tpl -text
 templates/de/html/theme_one.tpl -text
 templates/de/html/theme_select_box.tpl -text
 templates/de/html/theme_select_form.tpl -text
@@ -1513,30 +1579,4 @@ theme/desert/images/help/left.jpg -text
 theme/desert/images/help/right.jpg -text
 theme/desert/images/help/up.jpg -text
 theme/desert/theme.php -text
-unsupported/affiliblatt/inc/extensions/ext-affiliblatt.php -text
-unsupported/affiliblatt/inc/language/affiliblatt_de.php -text
-unsupported/affiliblatt/inc/libs/affiliblatt_functions.php -text
-unsupported/affiliblatt/inc/modules/admin/what-config_affiliblatt.php -text
-unsupported/affiliblatt/inc/modules/admin/what-list_affiliblatt_tm.php -text
-unsupported/affiliblatt/inc/reset/reset_affiliblatt.php -text
-unsupported/affiliblatt/templates/de/html/admin/admin_affiliblatt_error.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_config_affiliblatt.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_already.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_list_affiliblatt_tm_row.tpl -text
-unsupported/affiliblatt/templates/de/html/admin/admin_send_affiliblatt.tpl -text
-unsupported/affiliblatt/templates/de/html/ext/ext_affiliblatt.tpl -text
-unsupported/gollox/inc/extensions/ext-gollox.php -text
-unsupported/gollox/inc/language/gollox_de.php -text
-unsupported/gollox/inc/libs/gollox_functions.php -text
-unsupported/gollox/inc/modules/admin/what-config_gollox.php -text
-unsupported/gollox/inc/modules/admin/what-list_gollox_tm.php -text
-unsupported/gollox/inc/reset/reset_gollox.php -text
-unsupported/gollox/templates/de/html/admin/admin_config_gollox.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_gollox_error.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_already.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_list_gollox_tm_row.tpl -text
-unsupported/gollox/templates/de/html/admin/admin_send_gollox.tpl -text
-unsupported/gollox/templates/de/html/ext/ext_gollox.tpl -text
 /view.php -text