X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=DOCS%2FTODOs.txt;h=265b12d2427c00ec2c4343001ccaf16afcadebf0;hp=883f576a8ccc7029f78828d6b56b7b6e45d764ed;hb=00790481119eefa7a54a8dda1cb191fdf4f29226;hpb=77669502ccc2779d32a842f6d523fb68169fadda

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 883f576a8c..265b12d242 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -2,7 +2,7 @@
 ### DO NOT EDIT THIS FILE. ###
 ./api.php:68:// @TODO Do stuff here
 ./autoreg.php:62:// @TODO Add processing of request here
-./beg.php:175:			// @TODO Opps, what is missing 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/config-functions.php:150:	// @TODO Make this all better... :-/
@@ -14,65 +14,80 @@
 ./inc/email-functions.php:209:// @TODO $rawUserId is currently unused
 ./inc/expression-functions.php:173:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:46:	// @TODO is escapeQuotes() enough for strings with single/double quotes?
+./inc/extensions/bonus/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/ext-html_mail.php:136:		// @TODO Move these arrays into config
 ./inc/extensions/ext-menu.php:52:		// @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => (edit|add)_(admin|guest|member)_menu
-./inc/extensions/ext-network.php:18: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
-./inc/extensions/ext-network.php:19: * @TODO ADCocktail: Zero array element is return code!                 *
-./inc/extensions/ext-network.php:20: * @TODO adgain.de: Textlink-View is a JavaScript URL                   *
-./inc/extensions/ext-network.php:21: * @TODO ADkracher: Textlink-View is a JavaScript URL                   *
-./inc/extensions/ext-network.php:22: * @TODO Admono.de: highforcedbanner, traffic from abroad               *
-./inc/extensions/ext-network.php:23: * @TODO Affiliblatt: Layer requires script in head                     *
-./inc/extensions/ext-network.php:24: * @TODO Affiliblatt: Textlinks, popup, popunder, HTML mail, lead       *
-./inc/extensions/ext-network.php:25: * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
-./inc/extensions/ext-network.php:26: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
-./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response               *
-./inc/extensions/ext-network.php:28: * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
-./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:31: * @TODO SuperPromo24: HighForced banner, leader board, mini/page layer *
-./inc/extensions/ext-network.php:32: * @TODO SuperPromo24: Textlink view is a JavaScript                    *
-./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
-./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
-./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Layer not correct                         *
-./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
-./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
-./inc/extensions/ext-network.php:38: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:39: * @TODO Xijide: Lead/Sale (together) unsupported (no target URL)       *
-./inc/extensions/ext-network.php:40: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:97:		// @TODO network_type_handler is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:		// @TODO Move these into configuration
 ./inc/extensions/ext-nickname.php:52:		// @TODO NOT NULL DEFAULT '' is bad practice, use NULL
 ./inc/extensions/ext-yoomedia.php:120:		// @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:2169:			// @TODO Is this really neccessary?
-./inc/extensions-functions.php:2220:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
-./inc/extensions-functions.php:436:	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
-./inc/extensions-functions.php:452:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:592:		// @TODO Extension is loaded, what next?
+./inc/extensions-functions.php:2184:			// @TODO Is this really neccessary?
+./inc/extensions-functions.php:2235:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:439:	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
+./inc/extensions-functions.php:455:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:595:		// @TODO Extension is loaded, what next?
+./inc/extensions/network/mode-setup.php:18: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
+./inc/extensions/network/mode-setup.php:19: * @TODO ADCocktail: Zero array element is return code!                 *
+./inc/extensions/network/mode-setup.php:20: * @TODO adgain.de: Textlink-View is a JavaScript URL                   *
+./inc/extensions/network/mode-setup.php:21: * @TODO ADkracher: Textlink-View is a JavaScript URL                   *
+./inc/extensions/network/mode-setup.php:22: * @TODO Admono.de: highforcedbanner, traffic from abroad               *
+./inc/extensions/network/mode-setup.php:23: * @TODO Ads-AbisZ: HighForced banner, mini layer                       *
+./inc/extensions/network/mode-setup.php:24: * @TODO Ads-Im-Netz: All APIs provide URLs/JavaScripts                 *
+./inc/extensions/network/mode-setup.php:25: * @TODO Ads4Clicks: Some has JavaScript as output code, high forced    *
+./inc/extensions/network/mode-setup.php:26: * @TODO Affiliblatt: Layer requires script in head                     *
+./inc/extensions/network/mode-setup.php:27: * @TODO Affiliblatt: Textlinks, popup, popunder, HTML mail, lead       *
+./inc/extensions/network/mode-setup.php:28: * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
+./inc/extensions/network/mode-setup.php:29: * @TODO Earn4Webbis: HighForced banner, page peel, mini layer          *
+./inc/extensions/network/mode-setup.php:30: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
+./inc/extensions/network/mode-setup.php:31: * @TODO Fusion-Ads: Has click/banner URL in API response               *
+./inc/extensions/network/mode-setup.php:32: * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
+./inc/extensions/network/mode-setup.php:33: * @TODO GolloX: Please add full support                                *
+./inc/extensions/network/mode-setup.php:34: * @TODO LoseAds: HighForced banner, mini layer, all premium            *
+./inc/extensions/network/mode-setup.php:35: * @TODO Paid4Ad: HighForced banner, mini layer                         *
+./inc/extensions/network/mode-setup.php:36: * @TODO Sponsor-Box: HighForced banner, leader board, mini layer       *
+./inc/extensions/network/mode-setup.php:37: * @TODO Paid-4-Webmaster: leader board, mini layer                     *
+./inc/extensions/network/mode-setup.php:38: * @TODO Vario-Ads: HighForced banner, mini layer                       *
+./inc/extensions/network/mode-setup.php:39: * @TODO SuperPromo24: HighForced banner, leader board, mini/page layer *
+./inc/extensions/network/mode-setup.php:40: * @TODO SuperPromo24: Textlink view is a JavaScript                    *
+./inc/extensions/network/mode-setup.php:41: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
+./inc/extensions/network/mode-setup.php:42: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
+./inc/extensions/network/mode-setup.php:43: * @TODO Der Werbepartner.cc: Layer not correct                         *
+./inc/extensions/network/mode-setup.php:44: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
+./inc/extensions/network/mode-setup.php:45: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
+./inc/extensions/network/mode-setup.php:46: * @TODO Der Werbepartner.cc: Textlink not correct                      *
+./inc/extensions/network/mode-setup.php:47: * @TODO Xijide: Lead/Sale (together) unsupported (no target URL)       *
+./inc/extensions/network/mode-setup.php:48: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/network/mode-setup.php:94:// @TODO network_type_handler is an internal name and needs documentation
+./inc/extensions/order/mode-update.php:43:// @TODO Remove double-tab from all lines
+./inc/extensions/register/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/sponsor/mode-setup.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/sql_patches/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/user/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/filter/blacklist_filter.php:63:	// @TODO Insert log entry
 ./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/cache_filter.php:94:		// @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
 ./inc/filter/forced_filter.php:73:		// @TODO This part is unfinished
-./inc/filter-functions.php:117:	// @TODO Remove this forced removal after a year or so
-./inc/filters.php:1320:		// @TODO No banner found, output some default banner
-./inc/functions.php:1126:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1212:			// @TODO Are these convertions still required?
-./inc/functions.php:1233:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:1842:	// @TODO Find a way to cache this
-./inc/functions.php:1946:	// @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2150:	// @TODO Rename column data_type to e.g. mail_status
-./inc/functions.php:2500:// @TODO cacheFiles is not yet supported
+./inc/filter-functions.php:119:	// @TODO Remove this forced removal after a year or so
+./inc/filters.php:1380:		// @TODO No banner found, output some default banner
+./inc/functions.php:1131:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1217:			// @TODO Are these convertions still required?
+./inc/functions.php:1238:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1865:	// @TODO Find a way to cache this
+./inc/functions.php:1969:	// @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2173:	// @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2523:// @TODO cacheFiles is not yet supported
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:446:	// @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
 ./inc/install-functions.php:97:	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1154:	// @TODO Rewrite these two constants
-./inc/language/de.php:1170:	// @TODO Rewrite these three constants
+./inc/language/de.php:1161:	// @TODO Rewrite these two constants
+./inc/language/de.php:1177:	// @TODO Rewrite these three constants
 ./inc/language/de.php:46:	// @TODO Please sort these language elements
-./inc/language/de.php:742:// @TODO Are these constants longer used?
+./inc/language/de.php:748:// @TODO Are these constants longer used?
 ./inc/language-functions.php:254:	// @TODO These are all valid languages, again hard-coded
 ./inc/language/install_de.php:142:	// @TODO Move this to e.g. ext-smtp
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
-./inc/language/order_de.php:70:	// @TODO Find better text
+./inc/language/order_de.php:71:	// @TODO Find better text
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
 ./inc/language/refback_de.php:51:	// @TODO Rewrite these constants to one
 ./inc/libs/admins_functions.php:537:		// @TODO This can be, somehow, rewritten
@@ -82,10 +97,12 @@
 ./inc/libs/doubler_functions.php:44:// @TODO Lame description
 ./inc/libs/doubler_functions.php:96:			// @TODO Can't this be moved into EL?
 ./inc/libs/forced_functions.php:457:// @TODO Can't we use our new expression language instead of this ugly code?
-./inc/libs/mailid_functions.php:126:	// @TODO Rewrite these blocks to filter
+./inc/libs/mailid_functions.php:123:	// @TODO Rewrite these blocks to filter
 ./inc/libs/mailid_functions.php:47:		// @TODO Rewrite this to a dynamic include or so
-./inc/libs/mailid_functions.php:96:	// @TODO Rewrite this to a filter
-./inc/libs/network_functions.php:1182:	// @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine
+./inc/libs/mailid_functions.php:93:	// @TODO Rewrite this to a filter
+./inc/libs/network_functions.php:1111:	// @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine
+./inc/libs/network_functions.php:1117:	// @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine
+./inc/libs/network_functions.php:680:				// @TODO Unfinished: } elseif ((!empty($addSql)) && (
 ./inc/libs/order_functions.php:46:	// @TODO Move this array into a filter
 ./inc/libs/rallye_functions.php:771:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
 ./inc/libs/rallye_functions.php:838:	$EXPIRE = 3; // @TODO The hard-coded value...
@@ -114,11 +131,11 @@
 ./inc/modules/admin/admin-inc.php:533:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
 ./inc/modules/admin/admin-inc.php:880:// @TODO cacheFiles is not yet supported
 ./inc/modules/admin/overview-inc.php:176:				// @TODO Rewrite this to a filter
-./inc/modules/admin/overview-inc.php:289:				// @TODO Rewrite this to something with include files and/or filter
-./inc/modules/admin/overview-inc.php:323:						// @TODO This may also be rewritten to include files
-./inc/modules/admin/overview-inc.php:325:							default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:285:				// @TODO Rewrite this to something with include files and/or filter
+./inc/modules/admin/overview-inc.php:319:						// @TODO This may also be rewritten to include files
+./inc/modules/admin/overview-inc.php:321:							default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:436:			// @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:43:// @TODO This function does also check for uncompleted tasks
-./inc/modules/admin/overview-inc.php:440:			// @TODO Try to move this in includes
 ./inc/modules/admin/what-add_guestnl_cat.php:47:	// @TODO Check if category does already exist
 ./inc/modules/admin/what-admin_add.php:120:				// @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-admin_add.php:61:		// @TODO Cant this be rewritten?
@@ -128,7 +145,7 @@
 ./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment
 ./inc/modules/admin/what-config_points.php:90:				// @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter
 ./inc/modules/admin/what-config_register.php:79:	// @TODO Move this HTML code into a template
-./inc/modules/admin/what-del_email.php:61:		// @TODO Unused: cat_id, payment_id
+./inc/modules/admin/what-del_email.php:51:	// @TODO Unused: cat_id
 ./inc/modules/admin/what-edit_user.php:18: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_stats.php:46:// @TODO Unused at the moment
 ./inc/modules/admin/what-extensions.php:366:						// @TODO Rewrite this to a filter
@@ -157,55 +174,60 @@
 ./inc/modules/admin/what-mem_add.php:124:				// @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-mem_add.php:63:		// @TODO Cant this be rewritten?
 ./inc/modules/admin/what-mem_add.php:79:		// @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-unlock_emails.php:95:					// @TODO Rewrite these if-blocks to a filter
+./inc/modules/admin/what-unlock_emails.php:78:					// @TODO Rewrite these if-blocks to a filter
 ./inc/modules/admin/what-usage.php:89:	// @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 ./inc/modules/admin/what-usr_online.php:49:	// @TODO Add a filter for sponsor
-./inc/modules/frametester.php:95:	// @TODO Rewrite this somehow
+./inc/modules/frametester.php:91:	// @TODO Rewrite this somehow
 ./inc/modules/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 ./inc/modules/guest/what-mediadata.php:188:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:67:	// @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:99:	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/guest/what-sponsor_reg.php:293:			// @TODO Maybe a default referral id?
 ./inc/modules/guest/what-stats.php:111:		// @TODO This can be somehow rewritten
-./inc/modules/guest/what-stats.php:120:			// @TODO This does not exclude testers
+./inc/modules/guest/what-stats.php:120:			// @TODO This doesn't exclude tester accounts
 ./inc/modules/guest/what-stats.php:83:// @TODO This can be rewritten in a dynamic include
 ./inc/modules/member/what-beg.php:54:// @TODO Can't this be moved into EL?
 ./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 ./inc/modules/member/what-logout.php:17: * @TODO Rewrite the code to a filter                                   *
 ./inc/modules/member/what-logout.php:52:	// @TODO Move this in a filter, e.g. member_logout
-./inc/modules/member/what-order.php:463:			// @TODO Rewrite this to a filter
+./inc/modules/member/what-mydata.php:82:		// @TODO Move this to a function (for better EL code)
+./inc/modules/member/what-order.php:464:			// @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:72:	// @TODO Try to move out url_tlock to a filter for extra SQL statements
 ./inc/modules/member/what-payout.php:208:					// @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:61:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:99:	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/member/what-reflinks.php:52:// @TODO Move this into a filter
 ./inc/modules/member/what-transfer.php:128:				// @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:178:	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/member/what-unconfirmed.php:247:				// @TODO This 'userid' cannot be saved because of encapsulated EL code
-./inc/modules/order.php:78:		// @TODO Unused: 2,4
-./inc/mysql-manager.php:1492:		// @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1516:	// @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1832:			// @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2000:				// @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-./inc/mysql-manager.php:2123:			// @TODO Used generic 'userid' here
-./inc/mysql-manager.php:2344:// @TODO cacheFiles is not yet supported
+./inc/modules/member/what-unconfirmed.php:130:	// @TODO This call cannot be saved as EL code cannot be "framed" in other EL code
+./inc/modules/member/what-unconfirmed.php:174:	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:241:			// @TODO cat_id is unused
+./inc/modules/member/what-unconfirmed.php:244:				// @TODO This 'userid' cannot be saved because of encapsulated EL code
+./inc/modules/order.php:71:		// @TODO Unused: timestamp
+./inc/mysql-manager.php:1509:		// @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1533:	// @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1849:			// @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2017:				// @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+./inc/mysql-manager.php:2140:			// @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2361:// @TODO cacheFiles is not yet supported
 ./inc/mysql-manager.php:408:	// @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
+./inc/pool-functions.php:44:// @TODO "Hook" ext-html_mail into this to allow column `html_msg`
 ./inc/revision-functions.php:168:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1040:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
-./inc/template-functions.php:1095:			// @TODO Deprecate this thing
-./inc/template-functions.php:1106:			// @TODO Deprecate this thing
-./inc/template-functions.php:1228:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1277:		// @TODO Add a little more infos here
-./inc/template-functions.php:1658:// @TODO Lame description for this function
-./inc/template-functions.php:1680:			// @TODO Move this in a filter
+./inc/template-functions.php:1048:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
+./inc/template-functions.php:1103:			// @TODO Deprecate this thing
+./inc/template-functions.php:1114:			// @TODO Deprecate this thing
+./inc/template-functions.php:1236:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1291:		// @TODO Add a little more infos here
+./inc/template-functions.php:1672:// @TODO Lame description for this function
+./inc/template-functions.php:1694:			// @TODO Move this in a filter
 ./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:747:			// @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
-./inc/wrapper-functions.php:3209:	// @TODO Find a way to not use direct module comparison
-./inc/wrapper-functions.php:524:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:3215:	// @TODO Find a way to not use direct module comparison
+./inc/wrapper-functions.php:566:// @TODO Do some more sanity check here
 ./inc/xml-functions.php:240:	// @TODO Handle characters
-./mailid.php:117:		// @TODO Rewrite this to a filter/function
-./mailid.php:154:					// @TODO Rewrite this to a filter
+./mailid.php:123:		// @TODO Rewrite this to a filter/function
+./mailid.php:160:					// @TODO Rewrite this to a filter
 ./mailid.php:81:// @TODO Improve check on $data['type'], empty() is not very much ...
 ./templates/de/html/admin/admin_add_country.tpl:24:			<!-- @TODO Rewrite this selection box to our generic functions //-->
 ./templates/de/html/admin/admin_config_other.tpl:79:			<!-- @TODO Rewrite this selection to one of our functions //-->
@@ -252,6 +274,7 @@
 ./inc/modules/admin/what-config_rallye_prices.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_reg.php:2:// @DEPRECATED
 ./inc/modules/admin/what-del_task.php:2:// @DEPRECATED
+./inc/modules/admin/what-list_network_vcheck_params.php:2:// @DEPRECATED
 ./inc/modules/admin/what-list_newsletter.php:2:// @DEPRECATED
 ./inc/modules/admin/what-list_norefs.php:2:// @DEPRECATED
 ./inc/modules/admin/what-newsletter.php:2:// @DEPRECATED
@@ -270,6 +293,14 @@
 ./inc/stats_bonus.php:2:// @DEPRECATED
 ./inc/template.php:2:// @DEPRECATED
 ./mailid_top.php:2:// @DEPRECATED
+./templates/de/emails/admin/admin_autopurge_delete.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_del_mails.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_inactive.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_points.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_tsks.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_turbo.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_autopurge_unconfirmed.tpl:1:@DEPRECATED
+./templates/de/html/admin/admin_add_network_vcheck_param.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_add_reflevel.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_add_reflvl.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_add_shop_cat.tpl:1:<!-- @DEPRECATED //-->
@@ -285,6 +316,7 @@
 ./templates/de/html/admin/admin_config_transfer_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_edit_reflevel_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_edit_reflevel.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_export_network_vcheck_params.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_installed.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_list.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_search.tpl:1:<!-- @DEPRECATED //-->
@@ -294,6 +326,8 @@
 ./templates/de/html/admin/admin_forum_edit_del.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_forum_edit_forum.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_holiday_task.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_network_vcheck_params_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_network_vcheck_params.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_reflevel_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_reflevel.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_unconfirmed_header.tpl:1:<!-- @DEPRECATED //-->
@@ -306,6 +340,7 @@
 ./templates/de/html/admin/admin_mods_header_stats.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_list_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_list.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_network_vcheck_param_added.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_new_ext.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_newsletter_tsk.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_online_footer.tpl:1:<!-- @DEPRECATED //-->