Fixes for redirection problem

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index b5b6d7ecf392b72b3ae22eb6c0648b641e6e9158..a9063bf7772233acc48b133e4299dcee97f3fe14 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -95,6 +95,8 @@ inc/autopurge/purge-mails.php -text
 inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
+inc/cache/_compiled/.htaccess -text
+inc/cache/_compiled/templates/.htaccess -text
 inc/classes/.htaccess -text
 inc/classes/cachesystem.class.php -text
 inc/classes/rdf.class.php -text
@@ -193,6 +195,7 @@ inc/install-functions.php -text
 inc/install-inc.php -text
 inc/js/.htaccess -text
 inc/js/js- -text
+inc/js/js-cookies_disabled.php -text
 inc/js/js-jquery.php -text
 inc/js/js-order_send.php -text
 inc/js/js-surfbar_member_book.php -text
@@ -226,6 +229,7 @@ inc/language/maintenance_de.php -text
 inc/language/mediadata_de.php -text
 inc/language/menu_de.php -text
 inc/language/mods_de.php -text
+inc/language/network_de.php -text
 inc/language/newsletter_de.php -text
 inc/language/nickname_de.php -text
 inc/language/online_de.php -text
@@ -252,6 +256,7 @@ inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
+inc/libs/_functions.php -text
 inc/libs/active_functions.php -text
 inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
@@ -267,6 +272,7 @@ inc/libs/holiday_functions.php -text
 inc/libs/html_mail_functions.php -text
 inc/libs/jackpot_functions.php -text
 inc/libs/mediadata_functions.php -text
+inc/libs/network_functions.php -text
 inc/libs/newsletter_functions.php -text
 inc/libs/nickname_functions.php -text
 inc/libs/online_functions.php -text
@@ -324,6 +330,7 @@ inc/modules/admin/action-logout.php -text
 inc/modules/admin/action-menu.php -text
 inc/modules/admin/action-misc.php -text
 inc/modules/admin/action-mods.php -text
+inc/modules/admin/action-network.php -text
 inc/modules/admin/action-newsletter.php -text
 inc/modules/admin/action-payouts.php -text
 inc/modules/admin/action-primera.php -text
@@ -426,6 +433,7 @@ inc/modules/admin/what-list_country.php -text
 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_networks.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
@@ -745,8 +753,6 @@ templates/de/emails/admin/admin_wernis_request.tpl -text
 templates/de/emails/admins/.htaccess -text
 templates/de/emails/admins/admins_mail_contct_admin.tpl -text
 templates/de/emails/admins/admins_msg_contct_admin.tpl -text
-templates/de/emails/admins_mail_contct_admin.tpl -text
-templates/de/emails/admins_msg_contct_admin.tpl -text
 templates/de/emails/back-admin.tpl -text
 templates/de/emails/back-member.tpl -text
 templates/de/emails/beg/.htaccess -text
@@ -864,6 +870,7 @@ templates/de/html/admin/admin_add_banner.tpl -text
 templates/de/html/admin/admin_add_cat.tpl -text
 templates/de/html/admin/admin_add_country.tpl -text
 templates/de/html/admin/admin_add_max.tpl -text
+templates/de/html/admin/admin_add_network.tpl -text
 templates/de/html/admin/admin_add_payment.tpl -text
 templates/de/html/admin/admin_add_points.tpl -text
 templates/de/html/admin/admin_add_points_all.tpl -text
@@ -986,6 +993,7 @@ templates/de/html/admin/admin_edit_cats_row.tpl -text
 templates/de/html/admin/admin_edit_email.tpl -text
 templates/de/html/admin/admin_edit_email_row.tpl -text
 templates/de/html/admin/admin_edit_email_select.tpl -text
+templates/de/html/admin/admin_edit_networks_row.tpl -text
 templates/de/html/admin/admin_edit_payments.tpl -text
 templates/de/html/admin/admin_edit_payments_row.tpl -text
 templates/de/html/admin/admin_edit_rallyes.tpl -text
@@ -1058,6 +1066,8 @@ templates/de/html/admin/admin_list_links_problem.tpl -text
 templates/de/html/admin/admin_list_links_row.tpl -text
 templates/de/html/admin/admin_list_mods.tpl -text
 templates/de/html/admin/admin_list_mods_row.tpl -text
+templates/de/html/admin/admin_list_networks.tpl -text
+templates/de/html/admin/admin_list_networks_row.tpl -text
 templates/de/html/admin/admin_list_notify_emails.tpl -text
 templates/de/html/admin/admin_list_notify_emails_row.tpl -text
 templates/de/html/admin/admin_list_online.tpl -text
@@ -1080,6 +1090,7 @@ templates/de/html/admin/admin_list_rallyes_row2.tpl -text
 templates/de/html/admin/admin_list_refs.tpl -text
 templates/de/html/admin/admin_list_refs2.tpl -text
 templates/de/html/admin/admin_list_refs_level.tpl -text
+templates/de/html/admin/admin_list_refs_nodata.tpl -text
 templates/de/html/admin/admin_list_refs_norefs.tpl -text
 templates/de/html/admin/admin_list_refs_row.tpl -text
 templates/de/html/admin/admin_list_sponsor.tpl -text
@@ -1151,6 +1162,7 @@ templates/de/html/admin/admin_mods_stats.tpl -text
 templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
+templates/de/html/admin/admin_network_added.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_next_link.tpl -text
@@ -1245,6 +1257,7 @@ templates/de/html/copyright.tpl -text
 templates/de/html/copyright_backlink.tpl -text
 templates/de/html/css_inline.tpl -text
 templates/de/html/doubler/.htaccess -text
+templates/de/html/doubler/doubler_banner.tpl -text
 templates/de/html/doubler/doubler_footer.tpl -text
 templates/de/html/doubler/doubler_header.tpl -text
 templates/de/html/doubler/doubler_index.tpl -text
@@ -1389,6 +1402,7 @@ templates/de/html/install/install_page3.tpl -text
 templates/de/html/install/install_page5.tpl -text
 templates/de/html/install/install_welcome.tpl -text
 templates/de/html/js/.htaccess -text
+templates/de/html/js/js_cookies_disabled.tpl -text
 templates/de/html/js/js_jquery.tpl -text
 templates/de/html/js/js_order_send.tpl -text
 templates/de/html/js/js_surfbar_member_book.tpl -text
@@ -1546,6 +1560,7 @@ templates/de/html/menu/menu_member_advert_account.tpl -text
 templates/de/html/menu/menu_member_advert_bank.tpl -text
 templates/de/html/menu/menu_member_advert_end.tpl -text
 templates/de/html/menu/menu_member_advert_extras.tpl -text
+templates/de/html/menu/menu_member_advert_logout.tpl -text
 templates/de/html/menu/menu_member_advert_main.tpl -text
 templates/de/html/menu/menu_member_advert_order.tpl -text
 templates/de/html/menu/menu_member_advert_rals.tpl -text