X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=DOCS%2FTODOs.txt;h=e6c7cde3860fa170573f8c60633c6eddf2bb0a48;hp=cf295ec2c53b1520b6eaf31a510e6bdb42b55e4e;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=9554a8d81c0b81430503ef8156748ffbb61daa00

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index cf295ec2c5..e6c7cde386 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,77 +1,74 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY ./DOCS/todo-builder.sh (uid=1000/user=quix0r) ###
 ### DO NOT EDIT THIS FILE. ###
-./beg.php:191:			// @TODO Opps, what is missing here???
+./beg.php:172:			// @TODO Opps, what is missing here???
 ./birthday_confirm.php:93:		// @TODO Try to rewrite the following unset()
 ./inc/cache/config-local.php:122:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:461:	// @TODO Add support for more types which break in last else-block
-./inc/config-functions.php:157:	// @TODO Make this all better... :-/
-./inc/config-functions.php:332:		// @TODO Find a way for updating configuration here
-./inc/extensions/ext-html_mail.php:140:		// @TODO Move these arrays into config
+./inc/classes/cachesystem.class.php:464:	// @TODO Add support for more types which break in last else-block
+./inc/config-functions.php:143:	// @TODO Make this all better... :-/
+./inc/extensions/ext-html_mail.php:137:		// @TODO Move these arrays into config
+./inc/extensions/ext-network.php:71:		// @TODO network_type_name is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:215:		// @TODO Move these into configuration
-./inc/extensions/ext-rallye.php:329:		// @TODO Move this code into rallye_functions.php
-./inc/extensions/ext-sql_patches.php:725:			// @TODO Rewrite this to a filter
+./inc/extensions/ext-rallye.php:330:		// @TODO Move this code into rallye_functions.php
+./inc/extensions/ext-rallye.php:93:		// @TODO Fix config_rallye_prices to list_rallye_prices
+./inc/extensions/ext-sql_patches.php:741:			// @TODO Rewrite this to a filter
 ./inc/extensions/ext-sql_patches.php:94:		/* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-yoomedia.php:122:		// @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:55:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:370:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:481:		// @TODO Extension is loaded, what next?
-./inc/functions.php:1346:	// @TODO Remove this if() block if all is working fine
-./inc/functions.php:222:	// @TODO Remove this sanity-check if all is fine
-./inc/functions.php:225:	// @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2343:// @TODO Try to move this to inc/libs/theme_functions.php
-./inc/functions.php:2382:	// @TODO The status should never be empty
-./inc/functions.php:2514:// @TODO Please describe this function
-./inc/functions.php:2532:	searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
-./inc/functions.php:2617:		// @TODO Add a little more infos here
-./inc/functions.php:2628:	// @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-./inc/functions.php:264:				// @TODO Find all templates which are using these direct variables and rewrite them.
-./inc/functions.php:265:				// @TODO After this step is done, this else-block is history
-./inc/functions.php:2710:			// @TODO Rewrite this old lost code to a template
-./inc/functions.php:2829:			// @TODO Are these convertions still required?
-./inc/functions.php:2847:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:581:		// @TODO Extension 'msg' does not exist
-./inc/functions.php:658:// @TODO Rewrite this to an extension 'smtp'
+./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:489:		// @TODO Extension is loaded, what next?
+./inc/functions.php:225:	// @TODO Remove this sanity-check if all is fine
+./inc/functions.php:228:	// @TODO Try to rewrite all $DATA to $content
+./inc/functions.php:2352:// @TODO Try to move this to inc/libs/theme_functions.php
+./inc/functions.php:2523:// @TODO Please describe this function
+./inc/functions.php:2541:	searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
+./inc/functions.php:2637:		// @TODO Add a little more infos here
+./inc/functions.php:2648:	// @TODO This cannot be rewritten to app_die(), try to find a solution for this.
+./inc/functions.php:2730:			// @TODO Rewrite this old lost code to a template
+./inc/functions.php:2819:			// @TODO Are these convertions still required?
+./inc/functions.php:2837:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:546:		// @TODO Extension 'msg' does not exist
+./inc/functions.php:615:// @TODO Rewrite this to an extension 'smtp'
 ./inc/install-functions.php:62:	// @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1138:// @TODO Rewrite these two constants
-./inc/language/de.php:1154:// @TODO Rewrite these five constants
-./inc/language/de.php:734:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used.
-./inc/language/de.php:842:// @TODO Are these constants longer used?
+./inc/language/de.php:1141:// @TODO Rewrite these two constants
+./inc/language/de.php:1157:// @TODO Rewrite these five constants
+./inc/language/de.php:736:// @TODO The template 'admin_extensions_installed' is using this. But the template is no longer used.
+./inc/language/de.php:844:// @TODO Are these constants longer used?
 ./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function.
 ./inc/language/holiday_de.php:49:// @TODO Rewrite these two constants to one
-./inc/language/rallye_de.php:110:// @TODO Rewrite following two lines to one
+./inc/language/rallye_de.php:113:// @TODO Rewrite following two lines to one
+./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
 ./inc/language/refback_de.php:45:// @TODO Rewrite these constants to one
 ./inc/language/sponsor_de.php:118:// @TODO Rewrite these four constants to one and use sprintf()
 ./inc/libs/admins_functions.php:418:		// @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:57:		// @TODO Try to rewrite the following unset()
-./inc/libs/bonus_functions.php:206:			// @TODO Try to find a way for rewriting this constant
+./inc/libs/bonus_functions.php:215:			// @TODO Try to find a way for rewriting this constant
 ./inc/libs/doubler_functions.php:45:// @TODO Lame description
 ./inc/libs/rallye_functions.php:699:	$EXPIRE = 3; // @TODO The hard-coded value...
 ./inc/libs/rallye_functions.php:763:		// @TODO Rewrite this to our API function
 ./inc/libs/refback_functions.php:60:		// @TODO Try to rewrite the following unset()
-./inc/libs/surfbar_functions.php:1501:		// @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:954:	// @TODO Invalid salt should be refused
+./inc/libs/surfbar_functions.php:1497:		// @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:950:	// @TODO Invalid salt should be refused
 ./inc/libs/task_functions.php:244:		// @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:52:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:218:// @TODO Move this code block into a filter and register it with 'init'
 ./inc/libs/user_functions.php:137:	// @TODO These two constants are no longer used, maybe we reactivate this code?
-./inc/libs/user_functions.php:317:			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:342:			// @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:383:		// @TODO Can this query be merged with above query?
+./inc/libs/user_functions.php:313:			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:336:			// @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:409:	// @TODO We should try to rewrite this to fetchUserData() somehow
 ./inc/libs/yoomedia_functions.php:64:	$response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:76:	// @TODO Rewrite them to avoid this else block
 ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
-./inc/modules/admin/admin-inc.php:339:		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:344:				// @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:396:					// @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:402:							// @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:504:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
-./inc/modules/admin/admin-inc.php:517:		// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
+./inc/modules/admin/admin-inc.php:351:		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:356:				// @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:422:					// @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:428:							// @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:530:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:543:		// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
 ./inc/modules/admin/overview-inc.php:160:				// @TODO Rewrite this to a filter
-./inc/modules/admin/overview-inc.php:170:					// @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
-./inc/modules/admin/overview-inc.php:275:				// @TODO Rewrite this to something with include files
-./inc/modules/admin/overview-inc.php:313:						// @TODO This may also be rewritten to include files
-./inc/modules/admin/overview-inc.php:315:							default: // @TODO Unknown support mode
-./inc/modules/admin/overview-inc.php:434:			// @TODO Try to move this in includes
+./inc/modules/admin/overview-inc.php:274:				// @TODO Rewrite this to something with include files
+./inc/modules/admin/overview-inc.php:312:						// @TODO This may also be rewritten to include files
+./inc/modules/admin/overview-inc.php:314:							default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:433:			// @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:44:// @TODO This function does also check for uncompleted tasks
 ./inc/modules/admin.php:94:					// @TODO Why is this set to 'done'?
 ./inc/modules/admin/what-add_guestnl_cat.php:48:	// @TODO Check if category does already exist
@@ -85,27 +82,27 @@
 ./inc/modules/admin/what-chk_regs.php:65:		// @TODO Rewritings: surname->surname,family->family,ip->REMOTE_ADDR,ref->refid,hash->user_hash in template
 ./inc/modules/admin/what-config_admins.php:148:	// @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:137:		// @TODO Rewritings: mod->module in template
-./inc/modules/admin/what-config_rallye_prices.php:202:				// @TODO Rewritings: level->price_level, infos->info in template
-./inc/modules/admin/what-config_rallye_prices.php:219:			// @TODO Rewrite these two constants
+./inc/modules/admin/what-config_rallye_prices.php:211:				// @TODO Rewritings: level->price_level, infos->info in template
+./inc/modules/admin/what-config_rallye_prices.php:228:			// @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_register.php:67:	// @TODO Move this HTML code into a template
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_archiv.php:91:	// @TODO Rewrite to SQL_FETCHARRAY()
 ./inc/modules/admin/what-email_stats.php:47:// @TODO Unused at the moment
 ./inc/modules/admin/what-extensions.php:351:						// @TODO Rewrite this to a filter
-./inc/modules/admin/what-guest_add.php:122:				// @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-guest_add.php:61:		// @TODO Cant this be rewritten?
-./inc/modules/admin/what-guest_add.php:77:		// @TODO This can be somehow rewritten to a function
+./inc/modules/admin/what-guest_add.php:136:				// @TODO This can be somehow rewritten to a function
+./inc/modules/admin/what-guest_add.php:68:		// @TODO Cant this be rewritten?
+./inc/modules/admin/what-guest_add.php:84:		// @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-holiday_list.php:47:// @TODO Unused at the moment
 ./inc/modules/admin/what-list_autopurge.php:54:// @TODO Rewrite those lines to filter
 ./inc/modules/admin/what-list_autopurge.php:84:		// @TODO Rewritings: surname->surname,family->family in templates
 ./inc/modules/admin/what-list_beg.php:85:			// @TODO Rewrite templates so s/family will be replaced by surname/family
 ./inc/modules/admin/what-list_beg.php:86:			// @TODO to shorten this block. Please also do so with userid->userid
-./inc/modules/admin/what-list_cats.php:57:		// @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{?URL?}/modules.php?module=admin&amp;userid=");
-./inc/modules/admin/what-list_links.php:104:					// @TODO Rewrite this to includes/filter
-./inc/modules/admin/what-list_links.php:95:				// @TODO Find a way to rewrite this. See some lines above for different queries
-./inc/modules/admin/what-list_payouts.php:118:						// @TODO Do we need this time-consuming eval() here?
-./inc/modules/admin/what-list_rallyes.php:250:			// @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
-./inc/modules/admin/what-list_rallyes.php:303:			// @TODO Rewritings: admin_id->admin_id in template
+./inc/modules/admin/what-list_cats.php:55:		// @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{?URL?}/modules.php?module=admin&amp;userid=");
+./inc/modules/admin/what-list_links.php:56:		// @TODO Try to rewrite this to a filter
+./inc/modules/admin/what-list_links.php:88:				// @TODO Find a way to rewrite this. See some lines above for different queries
+./inc/modules/admin/what-list_links.php:97:					// @TODO Rewrite this to includes/filter
+./inc/modules/admin/what-list_payouts.php:117:						// @TODO Do we need this time-consuming eval() here?
+./inc/modules/admin/what-list_rallyes.php:266:			// @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
 ./inc/modules/admin/what-list_sponsor.php:148:			// @TODO Rewritings: surname->surname,family->family,ip->remote_addr in template
 ./inc/modules/admin/what-list_task.php:148:		// @TODO Rewrite these templates to one and add $OUT
 ./inc/modules/admin/what-list_task.php:182:			// @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
@@ -119,7 +116,6 @@
 ./inc/modules/admin/what-list_user.php:286:		// @TODO Rewrite this into a  filter
 ./inc/modules/admin/what-list_user.php:340:			// @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:58:// @TODO Rewrite these if-blocks in a filter
-./inc/modules/admin/what-lock_user.php:138:				// @TODO Rewrite these all constants
 ./inc/modules/admin/what-logs.php:68:			// @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:71:			// @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:125:				// @TODO This can be somehow rewritten to a function
@@ -132,16 +128,15 @@
 ./inc/modules/admin/what-usage.php:87:	// @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
 ./inc/modules/admin/what-usage.php:98:	// @TODO Disabled due to too much trouble
 ./inc/modules/admin/what-usr_online.php:50:	// @TODO Add a filter for sponsor
-./inc/modules/chk_login.php:52:		// @TODO Rewrite this into a filter
 ./inc/modules/guest/what-beg.php:59:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
-./inc/modules/guest/what-confirm.php:102:					// @TODO Try to rewrite the following unset()
+./inc/modules/guest/what-confirm.php:112:					// @TODO Try to rewrite the following unset()
 ./inc/modules/guest/what-login.php:107:	// @TODO Move this HTML code into a template
 ./inc/modules/guest/what-mediadata.php:182:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:69:	// @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:90:	// @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$adminId."\">".$login."</a>";
-./inc/modules/guest/what-register.php:198:	// @TODO Rewrite these all to a single filter
-./inc/modules/guest/what-register.php:276:	// @TODO Rewrite this to a filter
-./inc/modules/guest/what-register.php:292:		// @TODO Rewrite this to addPointsDirectly()
+./inc/modules/guest/what-register.php:193:	// @TODO Rewrite these all to a single filter
+./inc/modules/guest/what-register.php:271:	// @TODO Rewrite this to a filter
+./inc/modules/guest/what-register.php:287:		// @TODO Rewrite this to addPointsDirectly()
 ./inc/modules/guest/what-sponsor_infos.php:69:		// @TODO Rewritings: conv->conv_rate,name->conv_name in template
 ./inc/modules/guest/what-sponsor_infos.php:89:			// @TODO Rewritings: name->pay_name,min->pay_min_count,min->pay_min_count,curr->pay_currency
 ./inc/modules/guest/what-sponsor_reg.php:286:		// @TODO Swap this HTML code to templates
@@ -149,47 +144,49 @@
 ./inc/modules/guest/what-stats.php:75:// @TODO This can be rewritten in a dynamic include
 ./inc/modules/member/what-beg.php:89:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/member/what-bonus.php:56:	// @TODO Rewrite this to a filter
-./inc/modules/member/what-categories.php:112:		// @TODO Rewrite this to use $OUT .= ...
-./inc/modules/member/what-order.php:446:			// @TODO Rewrite this to a filter
-./inc/modules/member/what-payout.php:133:				// @TODO Rewritings: acc->target_account,bank->target_bank in templates
-./inc/modules/member/what-payout.php:229:					// @TODO Rewrite this to a filter
+./inc/modules/member/what-categories.php:129:		// @TODO Rewrite this to use $OUT .= ...
+./inc/modules/member/what-order.php:443:			// @TODO Rewrite this to a filter
+./inc/modules/member/what-payout.php:143:				// @TODO Rewritings: acc->target_account,bank->target_bank in templates
+./inc/modules/member/what-payout.php:241:					// @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:54:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:89:	// @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-reflinks.php:59:// @TODO Move this into a filter
 ./inc/modules/member/what-stats.php:118:		// @TODO Rewrite in template: clix->clicks
-./inc/modules/member/what-transfer.php:101:			// @TODO Rewrite this to a filter
-./inc/modules/member/what-transfer.php:143:				// @TODO Rewrite this to a filter
-./inc/modules/member/what-transfer.php:233:				// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
-./inc/modules/member/what-transfer.php:318:			// @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
-./inc/modules/member/what-transfer.php:324:				// @TODO Rewrite: tid->trans_id,stamp->time_trans
-./inc/modules/member/what-unconfirmed.php:132:	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-transfer.php:141:				// @TODO Rewrite this to a filter
+./inc/modules/member/what-transfer.php:231:				// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
+./inc/modules/member/what-transfer.php:316:			// @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
+./inc/modules/member/what-transfer.php:322:				// @TODO Rewrite: tid->trans_id,stamp->time_trans
+./inc/modules/member/what-transfer.php:99:			// @TODO Rewrite this to a filter
+./inc/modules/member/what-unconfirmed.php:144:	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:75:		// @TODO Unused: 2,4
-./inc/monthly/monthly_bonus.php:70:	// @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1592:			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1800:			// @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:2116:		// @TODO This can be somehow rewritten
+./inc/monthly/monthly_bonus.php:68:	// @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1667:			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1888:			// @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:2208:		// @TODO This can be somehow rewritten
 ./inc/mysql-manager.php:220:			// @TODO Nothing helped???
+./inc/mysql-manager.php:2231:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:255:			// @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:576:	// @TODO Try to rewrite this to one or more functions
-./inc/mysql-manager.php:605:				// @TODO Try to rewrite this to one or more functions
+./inc/mysql-manager.php:903:// @TODO Lame description for this function
 ./inc/mysql-manager.php:93:// @TODO Can we cache this?
-./inc/reset/reset_birthday.php:91:			// @TODO 4 is hard-coded here, should we move it out in config?
+./inc/reset/reset_birthday.php:92:			// @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
-./inc/wrapper-functions.php:396:// @TODO Do some more sanity check here
-./mailid.php:135:					// @TODO Rewrite this to a filter
-./mailid.php:215:	// @TODO Rewrite this to a dynamic include or so
+./inc/wrapper-functions.php:402:// @TODO Do some more sanity check here
+./mailid.php:134:					// @TODO Rewrite this to a filter
+./mailid.php:214:	// @TODO Rewrite this to a dynamic include or so
 ./mailid.php:94:		// @TODO Rewrite this to a filter
-./mailid_top.php:139:					// @TODO Rewrite this to a filter
-./mailid_top.php:186:							// @TODO Rewrite this to a filter
-./mailid_top.php:193:									// @TODO Rewrite this to a filter
-./mailid_top.php:229:									// @TODO Rewrite these blocks to filter
-./mailid_top.php:264:										// @TODO Try to rewrite the following unset()
-./mailid_top.php:96:		// @TODO Rewrite this to a filter
+./mailid_top.php:135:					// @TODO Rewrite this to a filter
+./mailid_top.php:182:							// @TODO Rewrite this to a filter
+./mailid_top.php:189:									// @TODO Rewrite this to a filter
+./mailid_top.php:225:									// @TODO Rewrite these blocks to filter
+./mailid_top.php:260:										// @TODO Try to rewrite the following unset()
+./mailid_top.php:99:		// @TODO Rewrite this to a filter
 ./view.php:72:		// @TODO No banner found, output some default banner
 ### ### DEPRECATION FOLLOWS: ### ###
-./inc/functions.php:249:		// @DEPRECATED Try to rewrite the if() condition
-./inc/functions.php:263:				// @DEPRECATED
-./inc/modules/admin/admin-inc.php:505:// @DEPRECATED
+./inc/modules/admin/admin-inc.php:531:// @DEPRECATED
+./templates/de/emails/admins_mail_contct_admin.tpl:1:@DEPRECATED
+./templates/de/emails/admins_msg_contct_admin.tpl:1:@DEPRECATED
 ### ### template-warnings.log follows: ### ###
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in 
@@ -204,14 +201,16 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de
 Warning: DOMDocument::loadHTMLFile(): Document is empty in templates/de/html/header.tpl, line: 1 in /home
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : body in templates/de/html/page_footer.tpl, line: 2 in /home
+Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : html in templates/de/html/page_footer.tpl, line: 3 in /home
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_uberwach.tpl.
+Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_book.tpl.
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer.tpl, line: 10 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_overview_footer.tpl, line: 11 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer.tpl, line: 12 in 
+Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer.tpl, line: 11 in 
+Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_overview_footer.tpl, line: 12 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_overview_footer_task.tpl, line: 10 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/admin/admin_overview_footer_task.tpl, line: 11 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in