Missing template added, fixed loadEmailTemplate() if templte was not found and debug...

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e36d72162205d671ea0437a0835f962bfb015656..c4b7a0969b1e1adfeed9ba7e613fc063936fdeda 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -571,6 +571,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
@@ -710,6 +711,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
@@ -881,6 +883,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
@@ -903,13 +908,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
@@ -1042,11 +1050,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
@@ -1338,6 +1348,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
@@ -1406,6 +1418,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
@@ -1454,6 +1468,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
@@ -1975,6 +1991,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
@@ -1989,6 +2007,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
@@ -2148,10 +2168,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