Commented out debug lines again

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 2d9eb52fc5fd0fa5f0f0a26b47b2eb4c2830edd7..ef855fa17093ab7d429fdff162fcfa4b5963147d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -96,8 +96,9 @@ inc/autopurge/purge-tsks.php svneol=native#text/plain
 inc/autopurge/purge-unconfirmed.php svneol=native#text/plain
 inc/cache/.htaccess svneol=native#text/plain
 inc/cache/_compiled/.htaccess svneol=native#text/plain
-inc/cache/_compiled/emails/.htaccess svneol=native#text/plain
+inc/cache/_compiled/email/.htaccess svneol=native#text/plain
 inc/cache/_compiled/html/.htaccess svneol=native#text/plain
+inc/cache/_compiled/xml/.htaccess svneol=native#text/plain
 inc/callback-functions.php svneol=native#text/plain
 inc/classes/.htaccess svneol=native#text/plain
 inc/classes/cachesystem.class.php svneol=native#text/plain
@@ -372,6 +373,7 @@ 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/grade_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
@@ -478,6 +480,8 @@ inc/modules/admin/action-user.php svneol=native#text/plain
 inc/modules/admin/action-wernis.php svneol=native#text/plain
 inc/modules/admin/admin-inc.php svneol=native#text/plain
 inc/modules/admin/overview-inc.php svneol=native#text/plain
+inc/modules/admin/subid- svneol=native#text/plain
+inc/modules/admin/subid-stats.php svneol=native#text/plain
 inc/modules/admin/what- svneol=native#text/plain
 inc/modules/admin/what-add_bank_package.php svneol=native#text/plain
 inc/modules/admin/what-add_guestnl_cat.php svneol=native#text/plain
@@ -568,6 +572,7 @@ inc/modules/admin/what-list_autopurge.php svneol=native#text/plain
 inc/modules/admin/what-list_bank_package.php svneol=native#text/plain
 inc/modules/admin/what-list_beg.php svneol=native#text/plain
 inc/modules/admin/what-list_bonus.php svneol=native#text/plain
+inc/modules/admin/what-list_booking.php svneol=native#text/plain
 inc/modules/admin/what-list_cats.php svneol=native#text/plain
 inc/modules/admin/what-list_country.php svneol=native#text/plain
 inc/modules/admin/what-list_coupon.php svneol=native#text/plain
@@ -581,6 +586,7 @@ 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_array_translation.php svneol=native#text/plain
+inc/modules/admin/what-list_network_data.php svneol=native#text/plain
 inc/modules/admin/what-list_network_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain
 inc/modules/admin/what-list_network_types.php svneol=native#text/plain
@@ -602,6 +608,7 @@ inc/modules/admin/what-list_task.php svneol=native#text/plain
 inc/modules/admin/what-list_transfer.php svneol=native#text/plain
 inc/modules/admin/what-list_unconfirmed.php svneol=native#text/plain
 inc/modules/admin/what-list_user.php svneol=native#text/plain
+inc/modules/admin/what-list_user_subid.php svneol=native#text/plain
 inc/modules/admin/what-list_wernis.php svneol=native#text/plain
 inc/modules/admin/what-list_yoomedia_tm.php svneol=native#text/plain
 inc/modules/admin/what-lock_sponsor.php svneol=native#text/plain
@@ -705,6 +712,7 @@ 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-forced_textlink.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
@@ -876,6 +884,9 @@ templates/de/emails/.htaccess svneol=native#text/plain
 templates/de/emails/add-points.tpl svneol=native#text/plain
 templates/de/emails/admin-del_links.tpl svneol=native#text/plain
 templates/de/emails/admin/.htaccess svneol=native#text/plain
+templates/de/emails/admin/admin_add_forced_ads.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_add_forced_campaigns.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_add_forced_costs.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_add_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_direct.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_admin_add_all_ref_referral.tpl svneol=native#text/plain
@@ -898,13 +909,16 @@ templates/de/emails/admin/admin_coupon_code.tpl svneol=native#text/plain
 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_mem_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_user_subids.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_forced_ads.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_edit_surfbar_actions.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
@@ -1037,11 +1051,13 @@ templates/de/emails/member/member_coupon.tpl svneol=native#text/plain
 templates/de/emails/member/member_coupon_code.tpl svneol=native#text/plain
 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_mem_delete_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_user_subids.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_mem_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_user_subids.tpl svneol=native#text/plain
 templates/de/emails/member/member_forced_campaign_pending_active.tpl svneol=native#text/plain
@@ -1165,6 +1181,7 @@ 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_forced_campaign.tpl svneol=native#text/plain
 templates/de/html/admin/admin_add_forced_costs.tpl svneol=native#text/plain
+templates/de/html/admin/admin_add_grade_data.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
@@ -1297,6 +1314,9 @@ templates/de/html/admin/admin_delete_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_normal.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_notify.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_extensions_row_404.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_ads.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_forced_costs.tpl svneol=native#text/plain
@@ -1305,6 +1325,8 @@ templates/de/html/admin/admin_delete_guest_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_guest_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_member_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_member_menu_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_network_array_translation.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_network_request_params.tpl svneol=native#text/plain
@@ -1328,6 +1350,8 @@ templates/de/html/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_transfer_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_row.tpl svneol=native#text/plain
@@ -1347,6 +1371,8 @@ templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_select.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_extensions_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_ads.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_ads_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_forced_campaigns.tpl svneol=native#text/plain
@@ -1360,6 +1386,8 @@ templates/de/html/admin/admin_edit_member_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_member_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_mods.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_mods_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_network_array_translation.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_network_request_params.tpl svneol=native#text/plain
@@ -1392,6 +1420,8 @@ templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_archiv_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_email_nav_row.tpl svneol=native#text/plain
@@ -1440,6 +1470,8 @@ templates/de/html/admin/admin_list_bonus_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_bonus_emails_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_bonus_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_bonus_rows.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_booking.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_booking_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_cats_404.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_cats_row.tpl svneol=native#text/plain
@@ -1462,6 +1494,8 @@ 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_extensions.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_extensions_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_forced_campaigns.tpl svneol=native#text/plain
@@ -1490,6 +1524,8 @@ templates/de/html/admin/admin_list_network_array_translation.tpl svneol=native#t
 templates/de/html/admin/admin_list_network_array_translation_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_config.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_config_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_network_data.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_network_data_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_params.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_network_request_params.tpl svneol=native#text/plain
@@ -1500,6 +1536,8 @@ templates/de/html/admin/admin_list_network_vcheck_params.tpl svneol=native#text/
 templates/de/html/admin/admin_list_network_vcheck_params_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_networks.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_networks_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_nickname_history.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_nickname_history_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_notify_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_notify_emails_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_online.tpl svneol=native#text/plain
@@ -1566,6 +1604,10 @@ templates/de/html/admin/admin_list_user_pagenav.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_sort.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_user_sort_form.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_stats.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_user_subid_stats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_wernis_main.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_wernis_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_yoomedia_tm.tpl svneol=native#text/plain
@@ -1951,6 +1993,8 @@ templates/de/html/member/member_holiday_form.tpl svneol=native#text/plain
 templates/de/html/member/member_html_mail_settings.tpl svneol=native#text/plain
 templates/de/html/member/member_list_beg.tpl svneol=native#text/plain
 templates/de/html/member/member_list_beg_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_booking.tpl svneol=native#text/plain
+templates/de/html/member/member_list_booking_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon.tpl svneol=native#text/plain
 templates/de/html/member/member_list_coupon_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_rallye.tpl svneol=native#text/plain
@@ -1965,6 +2009,8 @@ templates/de/html/member/member_list_referal_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral_level.tpl svneol=native#text/plain
 templates/de/html/member/member_list_referral_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflink_user_subids.tpl svneol=native#text/plain
+templates/de/html/member/member_list_reflink_user_subids_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_subid_stats.tpl svneol=native#text/plain
@@ -2124,10 +2170,17 @@ 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_actions_action_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_action_surfbar_option.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_new_status_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_new_status_surfbar_option.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_status_surfbar_box.tpl svneol=native#text/plain
+templates/de/html/select/select_actions_status_surfbar_option.tpl 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_id_popup_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_id_popup_option.tpl svneol=native#text/plain
+templates/de/html/select/select_forced_ads_id_textlink_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_ads_id_textlink_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