A lot email templates renamed, SQL fixed:
[mailer.git] / DOCS / TODOs.txt
index 0144fdb0dfdf9f0eb2a1e9e95e1a036865fefa8c..d4ee60e4efc876e423488bf996c7976ad6e7f6a6 100644 (file)
@@ -3,10 +3,11 @@
 ./autoreg.php:58:// @TODO Add processing of request here
 ./beg.php:171:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:93:             // @TODO Try to rewrite the following unset()
-./inc/autopurge/purge-inact.php:55:    // @TODO Rewrite these if() blocks to a filter
 ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:501:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:504:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:136:        // @TODO Make this all better... :-/
+./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
+./inc/daily/daily_birthday.php:95:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/expression-functions.php:164:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:46:     // @TODO is escapeQuotes() enougth for strings with single/double quotes?
 ./inc/extensions/ext-html_mail.php:136:                // @TODO Move these arrays into config
 ./inc/extensions/ext-network.php:25: * @TODO FuCoExSponsor: No High-Forced banner, HTML is BASE64 encoded   *
 ./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 GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:30: * @TODO VIPads: HTML text is send encoded with BASE64                  *
-./inc/extensions/ext-network.php:31: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
-./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
-./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Layer not correct                         *
-./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
-./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
-./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:37: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:91:           // @TODO network_type_handle is an internal name and needs documentation
+./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 VIPads: HTML text is send encoded with BASE64                  *
+./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
+./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
+./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct                         *
+./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
+./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
+./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
+./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
-./inc/extensions/ext-order.php:335:            // @TODO This should be moved out to inc/reset/
-./inc/extensions/ext-rallye.php:329:           // @TODO Move this code into rallye_functions.php
+./inc/extensions/ext-order.php:336:            // @TODO This should be moved out to inc/daily/
+./inc/extensions/ext-rallye.php:329:           // @TODO Move this code into a hook
 ./inc/extensions/ext-rallye.php:92:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @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:152:    // @TODO Do we still need this? setExtensionUpdateNotes('');
-./inc/extensions-functions.php:434:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:564:            // @TODO Extension is loaded, what next?
-./inc/functions.php:110:               // @TODO Extension 'msg' does not exist
-./inc/functions.php:1505:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1593:                      // @TODO Are these convertions still required?
-./inc/functions.php:1611:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:181:// @TODO Rewrite this to an extension 'smtp'
-./inc/functions.php:2272:      // @TODO This is still very static, rewrite it somehow
+./inc/extensions-functions.php:155:    // @TODO Do we still need this? setExtensionUpdateNotes('');
+./inc/extensions-functions.php:1927:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:424:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:554:            // @TODO Extension is loaded, what next?
+./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:92:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
+./inc/functions.php:1230:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1318:                      // @TODO Are these convertions still required?
+./inc/functions.php:1336:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:163:// @TODO Rewrite this to an extension 'smtp'
+./inc/functions.php:1927:      // @TODO Find a way to cache this
+./inc/functions.php:2028:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2208:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:92:                // @TODO Extension 'msg' does not exist
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
-./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInInclude(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1087:// @TODO Rewrite these two constants
-./inc/language/de.php:1102:// @TODO Rewrite these three constants
-./inc/language/de.php:280:     // @TODO Following two are unused?
-./inc/language/de.php:784:// @TODO Are these constants longer used?
-./inc/language-functions.php:243:      // @TODO These are all valid languages, again hard-coded
+./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+./inc/language/de.php:1079:    // @TODO Rewrite these two constants
+./inc/language/de.php:1100:    // @TODO Rewrite these three constants
+./inc/language/de.php:772:// @TODO Are these constants longer used?
+./inc/language-functions.php:255:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function.
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
 ./inc/language/refback_de.php:44:// @TODO Rewrite these constants to one
 ./inc/language/sponsor_de.php:117:// @TODO Rewrite these four constants to one and use sprintf()
-./inc/libs/admins_functions.php:435:           // @TODO This can be, somehow, rewritten
+./inc/libs/admins_functions.php:451:           // @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:55:               // @TODO Try to rewrite the following unset()
-./inc/libs/bonus_functions.php:201:            // @TODO Move this HTML to a template
-./inc/libs/bonus_functions.php:293:            // @TODO This query isn't right, it will only update if the user was for a longer time away!
-./inc/libs/cache_functions.php:78:             // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
+./inc/libs/bonus_functions.php:203:            // @TODO Move this HTML to a template
 ./inc/libs/doubler_functions.php:44:// @TODO Lame description
 ./inc/libs/doubler_functions.php:91:                   // @TODO Can't this be moved into EL?
 ./inc/libs/mailid_functions.php:47:            // @TODO Rewrite this to a dynamic include or so
 ./inc/libs/rallye_functions.php:854:// @TODO Please document this function
 ./inc/libs/rallye_functions.php:910:           // Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/refback_functions.php:59:           // @TODO Try to rewrite the following unset()
-./inc/libs/register_functions.php:315: // @TODO Rewrite these all to a single filter
-./inc/libs/register_functions.php:385: // @TODO Rewrite this to a filter
-./inc/libs/register_functions.php:392: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
+./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter
+./inc/libs/register_functions.php:360: // @TODO Rewrite this to a filter
+./inc/libs/register_functions.php:367: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
 ./inc/libs/sponsor_functions.php:159:                                  // @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:430:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1026: // @TODO Try to rewrite the following unset()
 ./inc/libs/surfbar_functions.php:1541:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:710:// @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/task_functions.php:239:             // @TODO These can be rewritten to filter
+./inc/libs/task_functions.php:240:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:93:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:144:     // @TODO These two constants are no longer used, maybe we reactivate this code?
 ./inc/libs/user_functions.php:611:                                     // @TODO Try to rewrite the following unset()
 ./inc/libs/yoomedia_functions.php:114: $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_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
+./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file                                        *
+./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter?
 ./inc/module-functions.php:267:                        // @TODO Nothing helped???
 ./inc/module-functions.php:308:                        // @TODO Rewrite this to a filter
-./inc/modules/admin/admin-inc.php:170:         // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
-./inc/modules/admin/admin-inc.php:241:         // @TODO This can be rewritten into a filter
-./inc/modules/admin/admin-inc.php:273:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:338:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:436:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:171:         // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
+./inc/modules/admin/admin-inc.php:242:         // @TODO This can be rewritten into a filter
+./inc/modules/admin/admin-inc.php:274:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:340:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:438:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
 ./inc/modules/admin/overview-inc.php:162:                              // @TODO Rewrite this to a filter
 ./inc/modules/admin/overview-inc.php:275:                              // @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:309:                                              // @TODO This may also be rewritten to include files
 ./inc/modules/admin/overview-inc.php:426:                      // @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/what-add_guestnl_cat.php:47:       // @TODO Check if category does already exist
-./inc/modules/admin/what-add_surfbar_url.php:55:       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData
+./inc/modules/admin/what-add_surfbar_url.php:55:       // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestParameter() calls to $postData
 ./inc/modules/admin/what-admin_add.php:118:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-admin_add.php:59:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-admin_add.php:75:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-adminedit.php:56:     // @TODO Kill all constants in this file
 ./inc/modules/admin/what-admins_mails.php:59:                          // @TODO Can this be rewritten to an API function?
 ./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment
-./inc/modules/admin/what-config_admins.php:126:        // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:55:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
-./inc/modules/admin/what-config_points.php:111:                        // @TODO Rewrite this to a filter
+./inc/modules/admin/what-config_points.php:110:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-config_rallye_prices.php:195:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_register.php:75:       // @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-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:363:                                           // @TODO Rewrite this to a filter
+./inc/modules/admin/what-extensions.php:364:                                           // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-guest_add.php:129:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-guest_add.php:67:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-guest_add.php:80:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-holiday_list.php:46:// @TODO Unused at the moment
+./inc/modules/admin/what-list_admins_acls.php:108:     // @TODO Rewrite this to a filter
+./inc/modules/admin/what-list_admins_acls.php:136:     // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter
-./inc/modules/admin/what-list_bonus.php:132:           // @TODO Can't this be moved into our expression language?
+./inc/modules/admin/what-list_bonus.php:133:           // @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_cats.php:54:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 ./inc/modules/admin/what-list_cats.php:69:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:55:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:85:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:94:                                    // @TODO Rewrite this to includes/filter
 ./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
-./inc/modules/admin/what-list_unconfirmed.php:80:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
-./inc/modules/admin/what-list_unconfirmed.php:99:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-./inc/modules/admin/what-list_user.php:149:            // @TODO Rewrite these to filters
-./inc/modules/admin/what-list_user.php:255:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:295:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_unconfirmed.php:107:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
+./inc/modules/admin/what-list_unconfirmed.php:84:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
+./inc/modules/admin/what-list_user.php:154:            // @TODO Rewrite these to filters
+./inc/modules/admin/what-list_user.php:262:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:311:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:57:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:64:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-unlock_emails.php:84:                                 // @TODO Rewrite these if-blocks to a filter
 ./inc/modules/admin/what-usage.php:87: // @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/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
+./inc/modules/guest/what-beg.php:51:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 ./inc/modules/guest/what-login.php:121:        // @TODO Move this HTML code into a template
 ./inc/modules/guest/what-mediadata.php:181:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:68:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:89:       // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
-./inc/modules/guest/what-sponsor_reg.php:295:                  // @TODO Maybe a default referal id?
+./inc/modules/guest/what-sponsor_reg.php:287:                  // @TODO Maybe a default referal id?
 ./inc/modules/guest/what-stats.php:100:                // @TODO This can be somehow rewritten
 ./inc/modules/guest/what-stats.php:74:// @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_UID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
+./inc/modules/member/what-beg.php:63:// @TODO No more needed? define('__BEG_USERID_TIMEOUT', createFancyTime(getBegUseridTimeout()));
 ./inc/modules/member/what-bonus.php:55:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:131:          // @TODO Rewrite this to use $OUT .= ...
-./inc/modules/member/what-order.php:426:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-logout.php:17: * @TODO Rewrite the code to a filter                                   *
+./inc/modules/member/what-order.php:427:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:85:                // @TODO Rewrite this to SQL_FETCHARRAY()
 ./inc/modules/member/what-payout.php:194:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:55:// @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-refback.php:124:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./inc/modules/member/what-reflinks.php:52:// @TODO Move this into a filter
 ./inc/modules/member/what-transfer.php:134:                            // @TODO Rewrite this to a filter
-./inc/modules/member/what-transfer.php:224:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
+./inc/modules/member/what-transfer.php:223:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
 ./inc/modules/member/what-transfer.php:96:                     // @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:141: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/member/what-unconfirmed.php:206:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
+./inc/modules/member/what-unconfirmed.php:142: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:207:                         // @TODO This 'userid' cannot be saved because of encapsulated EL code
 ./inc/modules/order.php:74:            // @TODO Unused: 2,4
-./inc/monthly/monthly_bonus.php:67:    // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1195:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1453:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1559:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1933:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1977:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/monthly/monthly_bonus.php:64:    // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1214:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1476:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1564:          // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1588:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1962:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2006:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:368:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
-./inc/reset/reset_beg.php:52:// @TODO This should be converted in a daily beg rallye
-./inc/reset/reset_birthday.php:92:                     // @TODO 4 is hard-coded here, should we move it out in config?
+./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1043:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1054:                     // @TODO Deprecate this thing
-./inc/template-functions.php:1141:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1174:             // @TODO Add a little more infos here
-./inc/template-functions.php:1483:// @TODO Lame description for this function
-./inc/template-functions.php:1505:                     // @TODO Move this in a filter
+./inc/template-functions.php:1055:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1066:                     // @TODO Deprecate this thing
+./inc/template-functions.php:1153:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1186:             // @TODO Add a little more infos here
+./inc/template-functions.php:1497:// @TODO Lame description for this function
+./inc/template-functions.php:1519:                     // @TODO Move this in a filter
 ./inc/template-functions.php:189:       * @TODO On some pages this is buggy
 ./inc/template-functions.php:265:      // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:578:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:602:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/template-functions.php:583:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:609:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/wrapper-functions.php:130:// @TODO Implement $compress
 ./inc/wrapper-functions.php:137:// @TODO Implement $decompress
-./inc/wrapper-functions.php:452:// @TODO Do some more sanity check here
+./inc/wrapper-functions.php:507:// @TODO Do some more sanity check here
 ./mailid.php:139:                                      // @TODO Rewrite this to a filter
 ./mailid.php:96:               // @TODO Rewrite this to a filter
 ./mailid_top.php:103:          // @TODO Rewrite this to a filter
 ./view.php:68:         // @TODO No banner found, output some default banner
 ./templates/de/html/admin/admin_add_country.tpl:23:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
 ./templates/de/html/admin/admin_admins_contct_form.tpl:4:      <!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_config_other.tpl:67:                   <!-- @TODO Rewrite this selection to one of our functions //-->
+./templates/de/html/admin/admin_config_other.tpl:79:                   <!-- @TODO Rewrite this selection to one of our functions //-->
+./templates/de/html/admin/admin_config_rewrite.tpl:4:  <!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_edit_admin_menu.tpl:4:<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_edit_mods.tpl:4:       <!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_autopurge.tpl:2:  <!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_beg.tpl:3:        <!-- @TODO No title here? //-->
-./templates/de/html/admin/admin_list_bonus.tpl:3:      <!-- @TODO No title here? //-->
-./templates/de/html/admin/admin_list_mods.tpl:4:       <!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_primera_main.tpl:3:<!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_list_refs_level.tpl:21:                <!-- @TODO Nothing to say here? //-->
 ./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3:<!-- @TODO Shouldn't we add a title here? //-->
-./templates/de/html/admin/admin_list_wernis_main.tpl:2:<!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_login_form.tpl:34:     @TODO Doesn't work with sessions
 ./templates/de/html/admin/admin_login_form.tpl:37:             @TODO Try to move the select box to our generic functions
 ./templates/de/html/admin/admin_optimize.tpl:3:        <!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/member/member_unconfirmed_table_nopoints.tpl:11:           <!-- @TODO Nothing to say here? //-->
 ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-sponsor) //-->
 ### ### DEPRECATION FOLLOWS: ### ###
-./inc/modules/admin/admin-inc.php:437:// @DEPRECATED
+./inc/autopurge/purge-general.php:2:// @DEPRECATED
+./inc/autopurge/purge-inact.php:2:// @DEPRECATED
+./inc/autopurge/purge-mails.php:2:// @DEPRECATED
+./inc/autopurge/purge-tsks.php:2:// @DEPRECATED
+./inc/autopurge/purge-unconfirmed.php:2:// @DEPRECATED
+./inc/daily/daily_engine.php:2:// @DEPRECATED
+./inc/loader/load_cache-admin.php:2:// @DEPRECATED
+./inc/loader/load_cache-config.php:2:// @DEPRECATED
+./inc/loader/load_cache-extension.php:2:// @DEPRECATED
+./inc/loader/load_cache-filter.php:2:// @DEPRECATED
+./inc/loader/load_cache-impressum.php:2:// @DEPRECATED
+./inc/loader/load_cache-modules.php:2:// @DEPRECATED
+./inc/loader/load_cache-refdepths.php:2:// @DEPRECATED
+./inc/loader/load_cache-refsystem.php:2:// @DEPRECATED
+./inc/loader/load_cache-revision.php:2:// @DEPRECATED
+./inc/loader/load_cache-them.php:2:// @DEPRECATED
+./inc/loader/load-extensions.php:2:// @DEPRECATED
+./inc/modules/admin/admin-inc.php:439:// @DEPRECATED
+./inc/modules/admin/what-config_admins.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_email.php:2:// @DEPRECATED
+./inc/reset/reset_100_bonus.php:2:// @DEPRECATED
+./inc/reset/reset_autopurge.php:2:// @DEPRECATED
+./inc/reset/reset_beg.php:2:// @DEPRECATED
+./inc/reset/reset_birthday.php:2:// @DEPRECATED
+./inc/reset/reset_bonus.php:2:// @DEPRECATED
+./inc/reset/reset_daily.php:2:// @DEPRECATED
+./inc/reset/reset_doubler.php:2:// @DEPRECATED
+./inc/reset/reset_engine.php:2:// @DEPRECATED
+./inc/reset/reset_holiday.php:2:// @DEPRECATED
+./inc/reset/reset_profile.php:2:// @DEPRECATED
+./inc/reset/reset_surfbar.php:2:// @DEPRECATED
+./inc/reset/reset_yoomedia.php:2:// @DEPRECATED
+./templates/de/emails/add-points.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/admin/admin_coupon.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/admin-del_links.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/back-admin.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/back-member.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/bonus-mail.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/confirm-member.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/confirm-referral.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/del-user.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/done-admin.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/done-member.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/lock-user.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/member/member_coupon.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/new-pass.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/normal-mail.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/order-accept.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/order-admin.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/order-deleted.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/order-member.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/order-reject.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/register-admin.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/register-member.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/sub-points.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/emails/unlock-user.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_cats_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_cats.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_order_form.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_edit.tpl:1:<!--@DEPRECATED //-->
+./templates/de/html/admin/admin_list_cats_404.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_send_reset_link.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.
@@ -252,17 +331,9 @@ PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/
 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(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 21 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 27 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 33 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 39 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/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(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_login_form.tpl, line: 29 in 
 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: 12 in