From 0ffa2dc5e25339dae68c672214952aa9e23e8b6b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Apr 2014 23:14:50 +0200 Subject: [PATCH] The maximum file size needs to be increased a little. Still you may not need to worry about your small files as @DEPRECATED must be included to be found by this script. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Deleted deprecated files + updated TODOs.txt. Signed-off-by: Roland Häder --- DOCS/TODOs.txt | 60 ++++++------------- contrib/get_Global.php | 3 - contrib/ideas/ext-affiliate.php | 3 - contrib/ideas/ext-coupon.php | 3 - contrib/ideas/ext-shredder.php | 3 - contrib/ideas/ext-signup.php | 3 - contrib/ideas/ext_coupon.tpl | 1 - contrib/ideas/ext_signup.tpl | 1 - contrib/remove-deprecated.sh | 2 +- .../de/emails/admin/admin_support-ordr.tpl | 1 - .../de/emails/admin/admin_support-reflink.tpl | 1 - .../admin/admin_support-unconfirmed.tpl | 1 - .../de/emails/member/member_support-ordr.tpl | 1 - .../emails/member/member_support-reflink.tpl | 1 - .../member/member_support-unconfirmed.tpl | 1 - templates/de/html/register_header.tpl | 1 - 16 files changed, 20 insertions(+), 66 deletions(-) delete mode 100644 contrib/get_Global.php delete mode 100644 contrib/ideas/ext-affiliate.php delete mode 100644 contrib/ideas/ext-coupon.php delete mode 100644 contrib/ideas/ext-shredder.php delete mode 100644 contrib/ideas/ext-signup.php delete mode 100644 contrib/ideas/ext_coupon.tpl delete mode 100644 contrib/ideas/ext_signup.tpl delete mode 100644 templates/de/emails/admin/admin_support-ordr.tpl delete mode 100644 templates/de/emails/admin/admin_support-reflink.tpl delete mode 100644 templates/de/emails/admin/admin_support-unconfirmed.tpl delete mode 100644 templates/de/emails/member/member_support-ordr.tpl delete mode 100644 templates/de/emails/member/member_support-reflink.tpl delete mode 100644 templates/de/emails/member/member_support-unconfirmed.tpl delete mode 100644 templates/de/html/register_header.tpl diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 8872529a55..9a7a4049f4 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -1,10 +1,10 @@ -### WARNING: THIS FILE IS AUTO-GENERATED BY ../../contrib/todo-builder.sh (uid=/user=quix0r) ### +### WARNING: THIS FILE IS AUTO-GENERATED BY ./contrib/todo-builder.sh (uid=/user=quix0r) ### ### DO NOT EDIT THIS FILE. ### ./api.php:68:// @TODO Do stuff here ./autoreg.php:62:// @TODO Add processing of request here ./beg.php:173: // @TODO Opps, what is missing here??? ./cron.php:62:// @TODO Do stuff here -./inc/classes/cachesystem.class.php:516: // @TODO Add support for more types which break in last else-block +./inc/classes/cachesystem.class.php:519: // @TODO Add support for more types which break in last else-block ./inc/config-functions.php:151: // @TODO Make this all better... :-/ ./inc/config-functions.php:329: // @TODO Call setConfigEntry() somehow ./inc/config-functions.php:359: // @TODO Call setConfigEntry() somehow @@ -89,28 +89,26 @@ ./inc/filter/bonus_filter.php:56: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/filter/forced_filter.php:75: // @TODO This part is unfinished ./inc/filter-functions.php:120: // @TODO Remove this forced removal after a year or so -./inc/filter-functions.php:438:// @TODO Add a filter chain here? E.g.: 'filter_chain_interrupted' -./inc/filter-functions.php:448:// @TODO Add a filter chain here? E.g.: 'filter_chain_continued' ./inc/filter/order_filter.php:132: // @TODO 200 is hard-coded here, swap it out to config + admin_config_order.tpl ./inc/filters.php:1394: // @TODO No banner found, output some default banner ./inc/filter/user_filter.php:279:// @TODO 0% done ./inc/filter/user_filter.php:289:// @TODO 0% done -./inc/filter/wernis_filter.php:125:// @TODO 0% done -./inc/filter/wernis_filter.php:135:// @TODO 0% done +./inc/filter/wernis_filter.php:126:// @TODO 0% done +./inc/filter/wernis_filter.php:136:// @TODO 0% done ./inc/filter/wernis_filter.php:62:// @TODO 10% done ./inc/filter/wernis_filter.php:80:// @TODO 10% done ./inc/filter/wernis_filter.php:98:// @TODO 10% done -./inc/functions.php:1216: // @TODO Are these convertions still required? -./inc/functions.php:1237:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:1541: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. -./inc/functions.php:1917: // @TODO Find a way to cache this -./inc/functions.php:2021: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:2225: // @TODO Rename column data_type to e.g. mail_status -./inc/functions.php:2575:// @TODO cacheFiles is not yet supported -./inc/gen_sql_patches.php:97:// @TODO Rewrite this to a filter +./inc/functions.php:1231: // @TODO Are these convertions still required? +./inc/functions.php:1252:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:1556: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. +./inc/functions.php:1932: // @TODO Find a way to cache this +./inc/functions.php:2036: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2252: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:2602:// @TODO cacheFiles is not yet supported +./inc/gen_sql_patches.php:98:// @TODO Rewrite this to a filter ./inc/header.php:66:// @TODO Find a way to not use direct module comparison ./inc/install-functions.php:107: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); -./inc/install-functions.php:456: // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work +./inc/install-functions.php:455: // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work ./inc/language/de.php:1150: // @TODO Rewrite these two constants ./inc/language/de.php:1166: // @TODO Rewrite these three constants ./inc/language/de.php:46: // @TODO Please sort these language elements @@ -147,6 +145,8 @@ ./inc/libs/theme_functions.php:93: // @TODO Can't this be rewritten to an API function? ./inc/libs/user_functions.php:325: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); ./inc/libs/user_functions.php:354: // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); +./inc/libs/wernis_functions.php:432:// @TODO Unused? +./inc/libs/wernis_functions.php:485: // @TODO Something more to do here? ./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:75: // @TODO Rewrite them to avoid this else block ./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file * @@ -252,7 +252,7 @@ ./inc/template-functions.php:209: * @TODO On some pages this is buggy ./inc/template-functions.php:298: // @TODO Remove these sanity checks if all is fine ./inc/template-functions.php:751: // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates -./inc/wrapper-functions.php:3286: // @TODO Find a way to not use direct module comparison +./inc/wrapper-functions.php:3298: // @TODO Find a way to not use direct module comparison ./inc/wrapper-functions.php:583:// @TODO Do some more sanity check here ./inc/xml-functions.php:240: // @TODO Handle characters ./mailid.php:123: // @TODO Rewrite this to a filter/function @@ -285,28 +285,6 @@ ./.htaccess:9: # @TODO When ext-imprint is finished RewriteRule ^cms/index/wht/impressum$ modules.php?module=index&what=imprint [L] ### ### DEPRECATION FOLLOWS: ### ### ./inc/modules/admin/admin-inc.php:537:// @DEPRECATED -./inc/template-functions.php:2402:// Removes comments with @DEPRECATED -./inc/template-functions.php:2410: // Is there a @DEPRECATED? -./inc/template-functions.php:2411: if (isInString('@DEPRECATED', $line)) { -./templates/de/emails/admin/admin_support-ordr.tpl:1:@DEPRECATED -./templates/de/emails/admin/admin_support-reflink.tpl:1:@DEPRECATED -./templates/de/emails/admin/admin_support-unconfirmed.tpl:1:@DEPRECATED -./templates/de/emails/member/member_support-ordr.tpl:1:@DEPRECATED -./templates/de/emails/member/member_support-reflink.tpl:1:@DEPRECATED -./templates/de/emails/member/member_support-unconfirmed.tpl:1:@DEPRECATED -### ### template-warnings.log follows: ### ### -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 8 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 9 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in +./inc/template-functions.php:2431:// Removes comments with @DEPRECATED +./inc/template-functions.php:2439: // Is there a @DEPRECATED? +./inc/template-functions.php:2440: if (isInString('@DEPRECATED', $line)) { diff --git a/contrib/get_Global.php b/contrib/get_Global.php deleted file mode 100644 index f551ef47b7..0000000000 --- a/contrib/get_Global.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/contrib/ideas/ext-affiliate.php b/contrib/ideas/ext-affiliate.php deleted file mode 100644 index d29d9d5fe3..0000000000 --- a/contrib/ideas/ext-affiliate.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/contrib/ideas/ext-coupon.php b/contrib/ideas/ext-coupon.php deleted file mode 100644 index 1dba4dcbbc..0000000000 --- a/contrib/ideas/ext-coupon.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/contrib/ideas/ext-shredder.php b/contrib/ideas/ext-shredder.php deleted file mode 100644 index 1dba4dcbbc..0000000000 --- a/contrib/ideas/ext-shredder.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/contrib/ideas/ext-signup.php b/contrib/ideas/ext-signup.php deleted file mode 100644 index 1dba4dcbbc..0000000000 --- a/contrib/ideas/ext-signup.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/contrib/ideas/ext_coupon.tpl b/contrib/ideas/ext_coupon.tpl deleted file mode 100644 index 74cecf3d72..0000000000 --- a/contrib/ideas/ext_coupon.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/contrib/ideas/ext_signup.tpl b/contrib/ideas/ext_signup.tpl deleted file mode 100644 index 74cecf3d72..0000000000 --- a/contrib/ideas/ext_signup.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/contrib/remove-deprecated.sh b/contrib/remove-deprecated.sh index d093948663..6148bf133e 100755 --- a/contrib/remove-deprecated.sh +++ b/contrib/remove-deprecated.sh @@ -6,7 +6,7 @@ if ! test -e "modules.php"; then fi echo "$0: Searching for deprecated PHP scripts ..." -LIST1=`find -type f -name "*.php" -size 24c -exec grep -H "@DEPRECATED" {} \;` +LIST1=`find -type f -name "*.php" -size -52c -exec grep -H "@DEPRECATED" {} \;` echo "$0: Searching for deprecated templates ..." LIST2=`find -type f -name "*.tpl" -exec grep -H "@DEPRECATED" {} \;` diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/admin/admin_support-ordr.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/admin/admin_support-reflink.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/admin/admin_support-unconfirmed.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/emails/member/member_support-ordr.tpl b/templates/de/emails/member/member_support-ordr.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/member/member_support-ordr.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/member/member_support-reflink.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl deleted file mode 100644 index 84d1ed3b8c..0000000000 --- a/templates/de/emails/member/member_support-unconfirmed.tpl +++ /dev/null @@ -1 +0,0 @@ -@DEPRECATED diff --git a/templates/de/html/register_header.tpl b/templates/de/html/register_header.tpl deleted file mode 100644 index 11f5d85d80..0000000000 --- a/templates/de/html/register_header.tpl +++ /dev/null @@ -1 +0,0 @@ - -- 2.30.2