Deprecated templates removed

diff --git a/.gitattributes b/.gitattributes
index 654153e8671310c986ed4bbff78324dd7651d34a..ab89fa767c831a9ee5c052b9bfd0f60f14fd6e10 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1155,8 +1155,6 @@ templates/de/html/admin/admin_list_task.tpl -text
 templates/de/html/admin/admin_list_task_delete.tpl -text
 templates/de/html/admin/admin_list_task_ext_rows.tpl -text
 templates/de/html/admin/admin_list_task_rows.tpl -text
-templates/de/html/admin/admin_list_theme.tpl -text
-templates/de/html/admin/admin_list_theme_row.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
@@ -1218,9 +1216,6 @@ templates/de/html/admin/admin_optimize.tpl -text
 templates/de/html/admin/admin_optimize_row.tpl -text
 templates/de/html/admin/admin_other_sqls.tpl -text
 templates/de/html/admin/admin_other_sqls_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_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
@@ -1229,7 +1224,6 @@ 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
-templates/de/html/admin/admin_payments_list_row.tpl -text
 templates/de/html/admin/admin_payout_accept_form.tpl -text
 templates/de/html/admin/admin_payout_add_new.tpl -text
 templates/de/html/admin/admin_payout_failed_transfer.tpl -text

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 265e6831f8a9db468a9165609f6e34e4c5adc44f..3f3a06d8609b1d4e8df2db55804b80135573bc36 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -74,9 +74,9 @@
 ./inc/libs/register_functions.php:372: // @TODO Rewrite this to a filter
 ./inc/libs/register_functions.php:379: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
 ./inc/libs/register_functions.php:380: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-./inc/libs/surfbar_functions.php:1535:         // @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:713:// @TODO Can't we use our new expression language instead of this ugly code?
-./inc/libs/surfbar_functions.php:951:  // @TODO Invalid salt should be refused
+./inc/libs/surfbar_functions.php:1534:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:712:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/surfbar_functions.php:950:  // @TODO Invalid salt should be refused
 ./inc/libs/task_functions.php:241:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
@@ -116,8 +116,7 @@
 ./inc/modules/admin/what-del_email.php:61:             // @TODO Unused: cat_id, payment_id
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-extensions.php:277:                           // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver
-./inc/modules/admin/what-extensions.php:356:                                           // @TODO Rewrite this to a filter
+./inc/modules/admin/what-extensions.php:354:                                           // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-guest_add.php:137:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-guest_add.php:69:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-guest_add.php:85:             // @TODO This can be somehow rewritten to a function
@@ -142,8 +141,6 @@
 ./inc/modules/admin/what-mem_add.php:126:                              // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-mem_add.php:65:               // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-mem_add.php:81:               // @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-payments.php:148:                     // @TODO Rewritings: title->mail_title in template
-./inc/modules/admin/what-refbanner.php:143:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
 ./inc/modules/admin/what-unlock_emails.php:89:                                 // @TODO Rewrite these if-blocks to a filter
 ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Add a filter for sponsor
@@ -168,7 +165,6 @@
 ./inc/modules/member/what-rallyes.php:91:      // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/member/what-refback.php:126:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./inc/modules/member/what-reflinks.php:54:// @TODO Move this into a filter
-./inc/modules/member/what-stats.php:74:                // @TODO More usage of EL at this array
 ./inc/modules/member/what-themes.php:116:      // @TODO Move this code into a template
 ./inc/modules/member/what-transfer.php:132:                            // @TODO Rewrite this to a filter
 ./inc/modules/member/what-transfer.php:222:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
@@ -234,11 +230,6 @@
 ./templates/de/html/surfbar/surfbar_frame_top.tpl:32:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
 ### ### DEPRECATION FOLLOWS: ### ###
 ./inc/modules/admin/admin-inc.php:439:// @DEPRECATED
-./templates/de/html/admin/admin_list_theme_row.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/html/admin/admin_list_theme.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/html/admin/admin_overview_footer_task.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/html/admin/admin_overview_footer.tpl:1:<!-- @DEPRECATED //-->
-./templates/de/html/admin/admin_overview_header_task.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl.

diff --git a/templates/de/html/admin/admin_list_theme.tpl b/templates/de/html/admin/admin_list_theme.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_list_theme.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_list_theme_row.tpl b/templates/de/html/admin/admin_list_theme_row.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_list_theme_row.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_overview_footer.tpl b/templates/de/html/admin/admin_overview_footer.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_overview_footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_overview_footer_task.tpl b/templates/de/html/admin/admin_overview_footer_task.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_overview_footer_task.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_overview_header_task.tpl b/templates/de/html/admin/admin_overview_header_task.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_overview_header_task.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->

diff --git a/templates/de/html/admin/admin_payments_list_row.tpl b/templates/de/html/admin/admin_payments_list_row.tpl
deleted file mode 100644 (file)
index 11f5d85..0000000
--- a/templates/de/html/admin/admin_payments_list_row.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- @DEPRECATED //-->