More misc fixes and rewrites (sorry, lame description)

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 0b7e640230dc8b46eacad7012c4b85361e23052b..35f2646bcd38352d10663c15f19e144ef3579537 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,5 @@
 * text=auto !eol
 /.htaccess -text
-/.svnignore -text
 DOCS/INSTALL.txt -text
 DOCS/LICENSE.txt -text
 DOCS/README -text
@@ -66,6 +65,7 @@ DOCS/en/rewrite/README_htaccess.de -text
 DOCS/en/task/README.txt -text
 DOCS/en/themes/README.txt -text
 DOCS/final-checker.sh -text
+DOCS/prop-set.sh -text
 DOCS/todo-builder.sh -text
 DOCS/tpl-validator.php -text
 DOCS/validator.sh -text
@@ -90,10 +90,10 @@ inc/autopurge/purge-mails.php -text
 inc/autopurge/purge-tsks.php -text
 inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
-inc/cache/.revision -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,11 +125,14 @@ inc/extensions/ext-doubler.php -text
 inc/extensions/ext-events.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-imprint.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
@@ -149,6 +152,7 @@ inc/extensions/ext-removeip.php -text
 inc/extensions/ext-repair.php -text
 inc/extensions/ext-rewrite.php -text
 inc/extensions/ext-safe.php -text
+inc/extensions/ext-seo.php -text
 inc/extensions/ext-sponsor.php -text
 inc/extensions/ext-sql_patches.php -text
 inc/extensions/ext-support.php -text
@@ -157,6 +161,7 @@ inc/extensions/ext-task.php -text
 inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
+inc/extensions/ext-uberwach.php -text
 inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
@@ -174,6 +179,8 @@ inc/hooks.php -text
 inc/img/.htaccess -text
 inc/install-inc.php -text
 inc/js/.htaccess -text
+inc/js/js-uberwach.php -text
+inc/language-functions.php -text
 inc/language.php -text
 inc/language/.htaccess -text
 inc/language/_de.php -text
@@ -190,7 +197,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
@@ -258,14 +264,17 @@ inc/libs/surfbar_functions.php -text
 inc/libs/task_functions.php -text
 inc/libs/theme_functions.php -text
 inc/libs/transfer_functions.php -text
+inc/libs/uberwach_functions.php -text
 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
 inc/loader/load_cache-config.php -text
+inc/loader/load_cache-filter.php -text
 inc/loader/load_cache-modreg.php -text
 inc/loader/load_cache-refdepths.php -text
 inc/loader/load_cache-refsystem.php -text
@@ -417,10 +426,10 @@ inc/modules/admin/what-optimize.php -text
 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_mmenu.php -text
+inc/modules/admin/what-repair_gmnu.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
@@ -435,7 +444,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
@@ -566,6 +574,7 @@ inc/phpmailer/language/phpmailer.lang-br.php -text
 inc/phpmailer/language/phpmailer.lang-ca.php -text
 inc/phpmailer/language/phpmailer.lang-cz.php -text
 inc/phpmailer/language/phpmailer.lang-de.php -text
+inc/phpmailer/language/phpmailer.lang-de.zip -text
 inc/phpmailer/language/phpmailer.lang-dk.php -text
 inc/phpmailer/language/phpmailer.lang-en.php -text
 inc/phpmailer/language/phpmailer.lang-es.php -text
@@ -625,6 +634,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 +900,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 +989,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 +1081,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 +1131,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 +1139,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 +1186,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 +1249,13 @@ 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_imprint.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
@@ -1265,6 +1275,7 @@ templates/de/html/ext/ext_removeip.tpl -text
 templates/de/html/ext/ext_repair.tpl -text
 templates/de/html/ext/ext_rewrite.tpl -text
 templates/de/html/ext/ext_safe.tpl -text
+templates/de/html/ext/ext_seo.tpl -text
 templates/de/html/ext/ext_sponsor.tpl -text
 templates/de/html/ext/ext_sql_patches.tpl -text
 templates/de/html/ext/ext_support.tpl -text
@@ -1273,6 +1284,7 @@ templates/de/html/ext/ext_task.tpl -text
 templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
+templates/de/html/ext/ext_uberwach.tpl -text
 templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
@@ -1319,9 +1331,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
@@ -1347,7 +1361,10 @@ templates/de/html/install/install_header.tpl -text
 templates/de/html/install/install_page1.tpl -text
 templates/de/html/install/install_page2.tpl -text
 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_uberwach.tpl -text
 templates/de/html/lead_code.tpl -text
 templates/de/html/loader.tpl -text
 templates/de/html/login_failed_js.tpl -text
@@ -1436,7 +1453,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 +1487,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 +1500,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 +1546,12 @@ 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/uberwach/.htaccess -text
+templates/de/html/uberwach/uberwach_snippet.tpl -text
 templates/de/html/welcome.tpl -text
 templates/en/html/admin/admin_welcome.tpl -text
 templates/en/html/impressum.tpl -text
@@ -1549,6 +1569,7 @@ theme/business/css/sponsor.css -text
 theme/business/css/surfbar.css -text
 theme/business/css/top10.css -text
 theme/business/css/transfer.css -text
+theme/business/css/uberwach.css -text
 theme/business/images/code_bg.jpg -text
 theme/business/images/code_bg.png -text
 theme/business/theme.php -text
@@ -1563,6 +1584,7 @@ theme/default/css/sponsor.css -text
 theme/default/css/surfbar.css -text
 theme/default/css/top10.css -text
 theme/default/css/transfer.css -text
+theme/default/css/uberwach.css -text
 theme/default/images/code_bg.jpg -text
 theme/default/images/code_bg.png -text
 theme/default/theme.php -text
@@ -1579,6 +1601,7 @@ theme/desert/css/sponsor.css -text
 theme/desert/css/surfbar.css -text
 theme/desert/css/top10.css -text
 theme/desert/css/transfer.css -text
+theme/desert/css/uberwach.css -text
 theme/desert/images/code_bg.jpg -text
 theme/desert/images/code_bg.png -text
 theme/desert/images/help/bullet.png -text
@@ -1587,4 +1610,6 @@ theme/desert/images/help/left.jpg -text
 theme/desert/images/help/right.jpg -text
 theme/desert/images/help/up.jpg -text
 theme/desert/theme.php -text
+uberwach/uberwach-button-gruen.gif -text
+uberwach/uberwach-kamera-gruen.gif -text
 /view.php -text