X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitattributes;h=df6f01f0e29655681a316885c31f98b2c03315b7;hb=98c6ed3e1dacc19134ba4a01000ee6a11bed31f2;hp=daf30353e93607da68f4c990d8381e595cf793c5;hpb=bd13da550348ba1963a434be7ceb9f1675aecadd;p=mailer.git

diff --git a/.gitattributes b/.gitattributes
index daf30353e9..df6f01f0e2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,6 +61,7 @@ DOCS/en/rewrite/.htaccess svneol=native#text/plain
 DOCS/en/rewrite/README.txt svneol=native#text/plain
 DOCS/en/task/README.txt svneol=native#text/plain
 DOCS/en/themes/README.txt svneol=native#text/plain
+DOCS/geoip_LICENSE.txt svneol=native#text/plain
 DOCS/tpl-validator.php svneol=native#text/plain
 /admin.php svneol=native#text/plain
 /agb.php svneol=native#text/plain
@@ -144,9 +145,11 @@ inc/extensions/ext-coupon.php svneol=native#text/plain
 inc/extensions/ext-debug.php svneol=native#text/plain
 inc/extensions/ext-demo.php svneol=native#text/plain
 inc/extensions/ext-doubler.php svneol=native#text/plain
+inc/extensions/ext-earning.php svneol=native#text/plain
 inc/extensions/ext-events.php svneol=native#text/plain
 inc/extensions/ext-forced.php svneol=native#text/plain
 inc/extensions/ext-funcoins.php svneol=native#text/plain
+inc/extensions/ext-geoip.php svneol=native#text/plain
 inc/extensions/ext-grade.php svneol=native#text/plain
 inc/extensions/ext-holiday.php svneol=native#text/plain
 inc/extensions/ext-html_mail.php svneol=native#text/plain
@@ -188,6 +191,7 @@ inc/extensions/ext-sql_patches.php svneol=native#text/plain
 inc/extensions/ext-support.php svneol=native#text/plain
 inc/extensions/ext-surfbar.php svneol=native#text/plain
 inc/extensions/ext-task.php svneol=native#text/plain
+inc/extensions/ext-teams.php svneol=native#text/plain
 inc/extensions/ext-terms.php svneol=native#text/plain
 inc/extensions/ext-theme.php svneol=native#text/plain
 inc/extensions/ext-timezone.php svneol=native#text/plain
@@ -210,6 +214,8 @@ inc/filter/bonus_filter.php svneol=native#text/plain
 inc/filter/booking_filter.php svneol=native#text/plain
 inc/filter/cache_filter.php svneol=native#text/plain
 inc/filter/coupon_filter.php svneol=native#text/plain
+inc/filter/earning_filter.php svneol=native#text/plain
+inc/filter/forced_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
 inc/filter/order_filter.php svneol=native#text/plain
@@ -271,7 +277,10 @@ inc/language/coupon_de.php svneol=native#text/plain
 inc/language/de.php svneol=native#text/plain
 inc/language/debug_de.php svneol=native#text/plain
 inc/language/doubler_de.php svneol=native#text/plain
+inc/language/earning_de.php svneol=native#text/plain
 inc/language/en.php svneol=native#text/plain
+inc/language/forced_de.php svneol=native#text/plain
+inc/language/funcoins_de.php svneol=native#text/plain
 inc/language/holiday_de.php svneol=native#text/plain
 inc/language/html_mail_de.php svneol=native#text/plain
 inc/language/imprint_de.php svneol=native#text/plain
@@ -326,7 +335,10 @@ inc/libs/country_functions.php svneol=native#text/plain
 inc/libs/coupon_functions.php svneol=native#text/plain
 inc/libs/debug_functions.php svneol=native#text/plain
 inc/libs/doubler_functions.php svneol=native#text/plain
+inc/libs/earning_functions.php svneol=native#text/plain
 inc/libs/events_functions.php svneol=native#text/plain
+inc/libs/forced_functions.php svneol=native#text/plain
+inc/libs/funcoins_functions.php svneol=native#text/plain
 inc/libs/holiday_functions.php svneol=native#text/plain
 inc/libs/html_mail_functions.php svneol=native#text/plain
 inc/libs/jackpot_functions.php svneol=native#text/plain
@@ -366,11 +378,13 @@ inc/loader/.htaccess svneol=native#text/plain
 inc/loader/load- svneol=native#text/plain
 inc/loader/load-admins.php svneol=native#text/plain
 inc/loader/load-config.php svneol=native#text/plain
+inc/loader/load-earning.php svneol=native#text/plain
 inc/loader/load-extension.php svneol=native#text/plain
 inc/loader/load-extensions.php svneol=native#text/plain
 inc/loader/load-filter.php svneol=native#text/plain
 inc/loader/load-imprint.php svneol=native#text/plain
 inc/loader/load-modules.php svneol=native#text/plain
+inc/loader/load-points_data.php svneol=native#text/plain
 inc/loader/load-refdepths.php svneol=native#text/plain
 inc/loader/load-refsystem.php svneol=native#text/plain
 inc/loader/load-revision.php svneol=native#text/plain
@@ -403,6 +417,8 @@ inc/modules/admin/action-country.php svneol=native#text/plain
 inc/modules/admin/action-coupon.php svneol=native#text/plain
 inc/modules/admin/action-doubler.php svneol=native#text/plain
 inc/modules/admin/action-email.php svneol=native#text/plain
+inc/modules/admin/action-forced.php svneol=native#text/plain
+inc/modules/admin/action-funcoins.php svneol=native#text/plain
 inc/modules/admin/action-grade.php svneol=native#text/plain
 inc/modules/admin/action-holiday.php svneol=native#text/plain
 inc/modules/admin/action-login.php svneol=native#text/plain
@@ -456,6 +472,7 @@ inc/modules/admin/what-config_coupon.php svneol=native#text/plain
 inc/modules/admin/what-config_doubler.php svneol=native#text/plain
 inc/modules/admin/what-config_email.php svneol=native#text/plain
 inc/modules/admin/what-config_extensions.php svneol=native#text/plain
+inc/modules/admin/what-config_funcoins.php svneol=native#text/plain
 inc/modules/admin/what-config_holiday.php svneol=native#text/plain
 inc/modules/admin/what-config_home.php svneol=native#text/plain
 inc/modules/admin/what-config_imprint.php svneol=native#text/plain
@@ -517,12 +534,16 @@ inc/modules/admin/what-list_country.php svneol=native#text/plain
 inc/modules/admin/what-list_coupon.php svneol=native#text/plain
 inc/modules/admin/what-list_doubler.php svneol=native#text/plain
 inc/modules/admin/what-list_email_max_rec.php svneol=native#text/plain
+inc/modules/admin/what-list_forced_ads.php svneol=native#text/plain
+inc/modules/admin/what-list_forced_campaigns.php svneol=native#text/plain
+inc/modules/admin/what-list_forced_costs.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_network_api_translation.php svneol=native#text/plain
 inc/modules/admin/what-list_network_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_types.php svneol=native#text/plain
 inc/modules/admin/what-list_networks.php svneol=native#text/plain
+inc/modules/admin/what-list_nickname.php svneol=native#text/plain
 inc/modules/admin/what-list_notifications.php svneol=native#text/plain
 inc/modules/admin/what-list_payouts.php svneol=native#text/plain
 inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain
@@ -634,6 +655,8 @@ inc/modules/member/what-booking.php svneol=native#text/plain
 inc/modules/member/what-cash_coupon.php svneol=native#text/plain
 inc/modules/member/what-categories.php svneol=native#text/plain
 inc/modules/member/what-doubler.php svneol=native#text/plain
+inc/modules/member/what-earning.php svneol=native#text/plain
+inc/modules/member/what-earnings.php svneol=native#text/plain
 inc/modules/member/what-guest.php svneol=native#text/plain
 inc/modules/member/what-holiday.php svneol=native#text/plain
 inc/modules/member/what-html_mail.php svneol=native#text/plain
@@ -803,6 +826,8 @@ templates/de/emails/admin/admin_coupon_purge.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_purge_row.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_earning_added.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_holiday_deactivated.tpl svneol=native#text/plain
@@ -909,6 +934,8 @@ templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
+templates/de/emails/member/member_earning_added.tpl svneol=native#text/plain
+templates/de/emails/member/member_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_activated.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_removed.tpl svneol=native#text/plain
@@ -929,6 +956,7 @@ templates/de/emails/member/member_profile.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_bronce.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_gold.tpl svneol=native#text/plain
+templates/de/emails/member/member_rallye_expired_other.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_expired_silver.tpl svneol=native#text/plain
 templates/de/emails/member/member_rallye_notify.tpl svneol=native#text/plain
 templates/de/emails/member/member_refback.tpl svneol=native#text/plain
@@ -1006,6 +1034,7 @@ templates/de/html/admin/admin_add_admins_acl.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_bank_package.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_cat.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_country.tpl svneol=native#text/plain
+templates/de/html/admin/admin_add_forced_ad.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_guest_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_max.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_member_menu.tpl svneol=native#text/plain
@@ -1014,6 +1043,7 @@ templates/de/html/admin/admin_add_network_api_translation.tpl svneol=native#text
 templates/de/html/admin/admin_add_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_network_type.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_payment.tpl svneol=native#text/plain
+templates/de/html/admin/admin_add_payout.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_points.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_points_all.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_rallye.tpl svneol=native#text/plain
@@ -1057,6 +1087,7 @@ templates/de/html/admin/admin_config_email_edit.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_email_edit_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_email_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_config_funcoins.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_holiday.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_home.tpl svneol=native#text/plain
 templates/de/html/admin/admin_config_home_main.tpl svneol=native#text/plain
@@ -1252,6 +1283,8 @@ templates/de/html/admin/admin_list_country_no_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_country_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_coupon.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_coupon_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_coupon_usr.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_coupon_usr_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_already.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_overview.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_waiting.tpl svneol=native#text/plain
@@ -1259,8 +1292,12 @@ templates/de/html/admin/admin_list_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_forced_ads.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_holiday.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_holiday_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_home.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_home_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_imprint.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_imprint_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_imprint_row_none.tpl svneol=native#text/plain
@@ -1269,6 +1306,10 @@ templates/de/html/admin/admin_list_links_problem.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_links_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_mods.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_mods_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_mods_stats.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_mods_stats2.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_mods_stats2_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_mods_stats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_api_translation.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_api_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_config.tpl svneol=native#text/plain
@@ -1445,6 +1486,8 @@ templates/de/html/beg/.htaccess svneol=native#text/plain
 templates/de/html/beg/beg_banner.tpl svneol=native#text/plain
 templates/de/html/beg/beg_done.tpl svneol=native#text/plain
 templates/de/html/beg/beg_failed.tpl svneol=native#text/plain
+templates/de/html/beg/beg_footer_banner.tpl svneol=native#text/plain
+templates/de/html/beg/beg_header_banner.tpl svneol=native#text/plain
 templates/de/html/beg/beg_link.tpl svneol=native#text/plain
 templates/de/html/beg/beg_login.tpl svneol=native#text/plain
 templates/de/html/beg/beg_pay_mode_both.tpl svneol=native#text/plain
@@ -1484,9 +1527,11 @@ templates/de/html/ext/ext_coupon.tpl svneol=native#text/plain
 templates/de/html/ext/ext_debug.tpl svneol=native#text/plain
 templates/de/html/ext/ext_demo.tpl svneol=native#text/plain
 templates/de/html/ext/ext_doubler.tpl svneol=native#text/plain
+templates/de/html/ext/ext_earning.tpl svneol=native#text/plain
 templates/de/html/ext/ext_events.tpl svneol=native#text/plain
 templates/de/html/ext/ext_forced.tpl svneol=native#text/plain
 templates/de/html/ext/ext_funcoins.tpl svneol=native#text/plain
+templates/de/html/ext/ext_geoip.tpl svneol=native#text/plain
 templates/de/html/ext/ext_grade.tpl svneol=native#text/plain
 templates/de/html/ext/ext_holiday.tpl svneol=native#text/plain
 templates/de/html/ext/ext_html_mail.tpl svneol=native#text/plain
@@ -1528,6 +1573,7 @@ templates/de/html/ext/ext_sql_patches.tpl svneol=native#text/plain
 templates/de/html/ext/ext_support.tpl svneol=native#text/plain
 templates/de/html/ext/ext_surfbar.tpl svneol=native#text/plain
 templates/de/html/ext/ext_task.tpl svneol=native#text/plain
+templates/de/html/ext/ext_teams.tpl svneol=native#text/plain
 templates/de/html/ext/ext_terms.tpl svneol=native#text/plain
 templates/de/html/ext/ext_theme.tpl svneol=native#text/plain
 templates/de/html/ext/ext_timezone.tpl svneol=native#text/plain
@@ -1669,6 +1715,11 @@ templates/de/html/member/member_content_right.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list_rows.tpl svneol=native#text/plain
+templates/de/html/member/member_earning.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_data_invalid.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_data_popup.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_popup_form_row.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_popup_row.tpl svneol=native#text/plain
 templates/de/html/member/member_edit_refback.tpl svneol=native#text/plain
 templates/de/html/member/member_footer.tpl svneol=native#text/plain
 templates/de/html/member/member_goto_top.tpl svneol=native#text/plain
@@ -1686,6 +1737,9 @@ templates/de/html/member/member_list_refback.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback_deleted_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback_level.tpl svneol=native#text/plain
 templates/de/html/member/member_list_refback_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_referal.tpl svneol=native#text/plain
+templates/de/html/member/member_list_referal_level.tpl svneol=native#text/plain
+templates/de/html/member/member_list_referal_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_reflinks.tpl svneol=native#text/plain
 templates/de/html/member/member_list_reflinks_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain
@@ -1832,6 +1886,10 @@ templates/de/html/removeip_level.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_row.tpl svneol=native#text/plain
 templates/de/html/runtime_fatal_table.tpl svneol=native#text/plain
 templates/de/html/select/.htaccess svneol=native#text/plain
+templates/de/html/select/select_admins_box.tpl svneol=native#text/plain
+templates/de/html/select/select_admins_option.tpl svneol=native#text/plain
+templates/de/html/select/select_forced_ads_type_box.tpl svneol=native#text/plain
+templates/de/html/select/select_forced_ads_type_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_box.tpl svneol=native#text/plain
 templates/de/html/select/select_network_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_type_box.tpl svneol=native#text/plain