Deprecated config.php removed. Please wait for further commits with an included fall...

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 50977e6cb7eeab471dcaa878d86ef1d9906732ea..e6403632b36a1c06948c411e3afc6a17a12bdaaa 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -92,7 +92,8 @@ inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
 inc/check-reset.php -text
 inc/config-functions.php -text
-inc/config.php -text
+inc/config-global.php -text
+inc/config-local.php.dist -text
 inc/databases.php -text
 inc/db/.htaccess -text
 inc/db/lib-mysql3.php -text
@@ -125,10 +126,12 @@ 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-lead.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-menu.php -text
 inc/extensions/ext-mods.php -text
 inc/extensions/ext-mydata.php -text
 inc/extensions/ext-network.php -text
@@ -189,7 +192,6 @@ inc/language/country_de.php -text
 inc/language/de.php -text
 inc/language/debug_de.php -text
 inc/language/doubler_de.php -text
-inc/language/en.ph -text
 inc/language/en.php -text
 inc/language/holiday_de.php -text
 inc/language/html_mail_de.php -text
@@ -261,6 +263,7 @@ inc/libs/user_functions.php -text
 inc/libs/wernis_functions.php -text
 inc/libs/yoomedia_functions.php -text
 inc/load_cache.php -text
+inc/load_config.php -text
 inc/load_extensions.php -text
 inc/loader/.htaccess -text
 inc/loader/load_cache-admin.php -text
@@ -417,9 +420,12 @@ inc/modules/admin/what-overview.php -text
 inc/modules/admin/what-payments.php -text
 inc/modules/admin/what-refbanner.php -text
 inc/modules/admin/what-repair_amenu.php -text
+inc/modules/admin/what-repair_amnu.php -text
 inc/modules/admin/what-repair_cats.php -text
 inc/modules/admin/what-repair_gmenu.php -text
+inc/modules/admin/what-repair_gmnu.php -text
 inc/modules/admin/what-repair_mmenu.php -text
+inc/modules/admin/what-repair_mmnu.php -text
 inc/modules/admin/what-send_bonus.php -text
 inc/modules/admin/what-send_newsletter.php -text
 inc/modules/admin/what-stats_mods.php -text
@@ -434,7 +440,6 @@ inc/modules/admin/what-unlock_surfbar_urls.php -text
 inc/modules/admin/what-updates.php -text
 inc/modules/admin/what-usage.php -text
 inc/modules/admin/what-user_contct.php -text
-inc/modules/admin/what-user_online.php -text
 inc/modules/admin/what-usr_online.php -text
 inc/modules/chk_login.php -text
 inc/modules/frametester.php -text
@@ -625,6 +630,7 @@ inc/stylesheet.php -text
 inc/weekly/.htaccess -text
 inc/weekly/weekly_ -text
 inc/weekly/weekly_surfbar.php -text
+inc/wrapper-functions.php -text
 /index.php -text
 /install.php -text
 install/menu-de.sql -text
@@ -890,6 +896,7 @@ templates/de/html/admin/admin_config_extensions.tpl -text
 templates/de/html/admin/admin_config_holiday.tpl -text
 templates/de/html/admin/admin_config_home.tpl -text
 templates/de/html/admin/admin_config_home_main.tpl -text
+templates/de/html/admin/admin_config_home_row.tpl -text
 templates/de/html/admin/admin_config_home_settings.tpl -text
 templates/de/html/admin/admin_config_home_settings_pro.tpl -text
 templates/de/html/admin/admin_config_mediadata.tpl -text
@@ -978,7 +985,6 @@ 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
 templates/de/html/admin/admin_extensions_delete_row.tpl -text
 templates/de/html/admin/admin_extensions_edit.tpl -text
@@ -1071,7 +1077,7 @@ templates/de/html/admin/admin_list_task_rows.tpl -text
 templates/de/html/admin/admin_list_transfer.tpl -text
 templates/de/html/admin/admin_list_transfer_row.tpl -text
 templates/de/html/admin/admin_list_unconfirmed.tpl -text
-templates/de/html/admin/admin_list_unconfirmed_header.tpl -text
+templates/de/html/admin/admin_list_unconfirmed_list.tpl -text
 templates/de/html/admin/admin_list_unconfirmed_row.tpl -text
 templates/de/html/admin/admin_list_user.tpl -text
 templates/de/html/admin/admin_list_user_alpha.tpl -text
@@ -1121,7 +1127,6 @@ 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_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
@@ -1130,14 +1135,13 @@ 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
 templates/de/html/admin/admin_optimize_row.tpl -text
-templates/de/html/admin/admin_overview_footer.tpl -text
 templates/de/html/admin/admin_overview_footer_task.tpl -text
-templates/de/html/admin/admin_overview_header.tpl -text
 templates/de/html/admin/admin_overview_header_task.tpl -text
 templates/de/html/admin/admin_overview_list.tpl -text
 templates/de/html/admin/admin_overview_list_ext_rows.tpl -text
 templates/de/html/admin/admin_overview_list_rows.tpl -text
 templates/de/html/admin/admin_overview_row.tpl -text
+templates/de/html/admin/admin_overview_table.tpl -text
 templates/de/html/admin/admin_overview_task.tpl -text
 templates/de/html/admin/admin_overview_task_extras.tpl -text
 templates/de/html/admin/admin_overview_task_rows.tpl -text
@@ -1178,7 +1182,6 @@ templates/de/html/admin/admin_surfbar_stats_row.tpl -text
 templates/de/html/admin/admin_surfbar_url_stats.tpl -text
 templates/de/html/admin/admin_surfbar_url_stats_row.tpl -text
 templates/de/html/admin/admin_task_holiday.tpl -text
-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
@@ -1242,10 +1245,12 @@ 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_lead.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_menu.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
@@ -1319,9 +1324,11 @@ templates/de/html/guest/guest_register_refid_hide.tpl -text
 templates/de/html/guest/guest_sponsor_act_row.tpl -text
 templates/de/html/guest/guest_sponsor_activate.tpl -text
 templates/de/html/guest/guest_sponsor_infos.tpl -text
+templates/de/html/guest/guest_sponsor_infos_none_row.tpl -text
 templates/de/html/guest/guest_sponsor_login.tpl -text
 templates/de/html/guest/guest_sponsor_lost.tpl -text
 templates/de/html/guest/guest_sponsor_pay_row.tpl -text
+templates/de/html/guest/guest_sponsor_payment_row.tpl -text
 templates/de/html/guest/guest_sponsor_reg.tpl -text
 templates/de/html/guest/guest_stats_cats_row.tpl -text
 templates/de/html/guest/guest_stats_member.tpl -text
@@ -1436,7 +1443,6 @@ templates/de/html/member/member_points_upgrade.tpl -text
 templates/de/html/member/member_pool_row.tpl -text
 templates/de/html/member/member_pool_table.tpl -text
 templates/de/html/member/member_primera.tpl -text
-templates/de/html/member/member_primera_form.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text
 templates/de/html/member/member_primera_mode_list_row.tpl -text
 templates/de/html/member/member_primera_mode_pay.tpl -text
@@ -1471,6 +1477,8 @@ templates/de/html/member/member_themes.tpl -text
 templates/de/html/member/member_transfer_list.tpl -text
 templates/de/html/member/member_transfer_new.tpl -text
 templates/de/html/member/member_transfer_overview.tpl -text
+templates/de/html/member/member_transfer_row.tpl -text
+templates/de/html/member/member_transfer_row2.tpl -text
 templates/de/html/member/member_transfer_settings.tpl -text
 templates/de/html/member/member_unconfirmed_404.tpl -text
 templates/de/html/member/member_unconfirmed_404_nopoints.tpl -text
@@ -1482,7 +1490,6 @@ templates/de/html/member/member_welcome.tpl -text
 templates/de/html/member/member_welcome_footer.tpl -text
 templates/de/html/member/member_welcome_header.tpl -text
 templates/de/html/member/member_wernis.tpl -text
-templates/de/html/member/member_wernis_form.tpl -text
 templates/de/html/member/member_wernis_mode_choose.tpl -text
 templates/de/html/member/member_wernis_mode_list.tpl -text
 templates/de/html/member/member_wernis_mode_list_row.tpl -text
@@ -1529,9 +1536,10 @@ 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
+templates/de/html/theme/.htaccess -text
+templates/de/html/theme/theme_one.tpl -text
+templates/de/html/theme/theme_select_box.tpl -text
+templates/de/html/theme/theme_select_form.tpl -text
 templates/de/html/welcome.tpl -text
 templates/en/html/admin/admin_welcome.tpl -text
 templates/en/html/impressum.tpl -text