A lot code rewritten:
[mailer.git] / DOCS / TODOs.txt
index e2b612f4614abc790856a39e98179f25be306c80..9e5ceb7d0e7757cebc7987358dfae700d2a66ba2 100644 (file)
@@ -2,12 +2,13 @@
 ### DO NOT EDIT THIS FILE. ###
 ./autoreg.php:60:// @TODO Add processing of request here
 ./beg.php:173:                 // @TODO Opps, what is missing here???
-./birthday_confirm.php:94:             // @TODO Try to rewrite the following unset()
+./birthday_confirm.php:99:             // @TODO Try to rewrite the following unset()
 ./inc/autopurge/purge-inact.php:57:    // @TODO Rewrite these if() blocks to a filter
-./inc/cache/config-local.php:125:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:468:       // @TODO Add support for more types which break in last else-block
-./inc/config-functions.php:144:        // @TODO Make this all better... :-/
-./inc/expression-functions.php:136:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+./inc/cache/config-local.php:126:// @TODO Rewrite the following three constants, somehow...
+./inc/classes/cachesystem.class.php:474:       // @TODO Add support for more types which break in last else-block
+./inc/config-functions.php:140:        // @TODO Make this all better... :-/
+./inc/expression-functions.php:152:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
+./inc/expression-functions.php:48:     // @TODO is escapeQuotes() enougth for strings with single/double quotes?
 ./inc/extensions/ext-html_mail.php:138:                // @TODO Move these arrays into config
 ./inc/extensions/ext-menu.php:54:              // @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => mem_menu_(edit|add)
 ./inc/extensions/ext-network.php:20: * @TODO AbisZED: Which charset?                                        *
 ./inc/extensions/ext-network.php:22: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
 ./inc/extensions/ext-network.php:23: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
 ./inc/extensions/ext-network.php:24: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
-./inc/extensions/ext-network.php:25: * @TODO doubleads: Which charset?                                      *
-./inc/extensions/ext-network.php:26: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
-./inc/extensions/ext-network.php:27: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:28: * @TODO homeADS: Which charset?                                        *
-./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:30: * @TODO Der Werbepartner.cc: Has click/banner URL in API response      *
-./inc/extensions/ext-network.php:84:           // @TODO network_type_handle is an internal name and needs documentation
-./inc/extensions/ext-newsletter.php:216:               // @TODO Move these into configuration
+./inc/extensions/ext-network.php:25: * @TODO AllAds4You: Traffic from abroad                                *
+./inc/extensions/ext-network.php:26: * @TODO doubleads: Which charset?                                      *
+./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:29: * @TODO homeADS: Which charset?                                        *
+./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner?                      *
+./inc/extensions/ext-network.php:31: * @TODO VIPads: Which charset?                                         *
+./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:92:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-newsletter.php:220:               // @TODO Move these into configuration
+./inc/extensions/ext-order.php:344:            // @TODO This should be moved out to inc/reset/
 ./inc/extensions/ext-rallye.php:331:           // @TODO Move this code into rallye_functions.php
 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-sql_patches.php:763:                      // @TODO Rewrite this to a filter
-./inc/extensions/ext-sql_patches.php:95:               /* @TODO SQL_ALTER_TABLE() should work now properly
 ./inc/extensions/ext-yoomedia.php:123:         // @TODO Can this be moved into a database table?
-./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:380:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:493:            // @TODO Extension is loaded, what next?
-./inc/functions.php:1011:// @TODO $simple is deprecated
-./inc/functions.php:1046:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/functions.php:2489:              // @TODO Add a little more infos here
-./inc/functions.php:256:       // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:2572:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:2595:                      // @TODO Rewrite this old lost code to a template
-./inc/functions.php:259:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2684:                      // @TODO Are these convertions still required?
-./inc/functions.php:2702:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3581:// @TODO Lame description for this function
-./inc/functions.php:3603:                      // @TODO Move this in a filter
-./inc/functions.php:3727:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:474:       // @TODO Do only use $content, not $DATA or raw variables
-./inc/functions.php:544:               // @TODO Extension 'msg' does not exist
-./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp'
+./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
+./inc/extensions-functions.php:143:    // @TODO Do we still need this? setExtensionUpdateNotes('');
+./inc/extensions-functions.php:428:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:544:            // @TODO Extension is loaded, what next?
+./inc/functions.php:115:               // @TODO Extension 'msg' does not exist
+./inc/functions.php:1472:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1495:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:1563:                      // @TODO Are these convertions still required?
+./inc/functions.php:1581:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:178:// @TODO Rewrite this to an extension 'smtp'
+./inc/functions.php:2234:      // @TODO This is still very static, rewrite it somehow
 ./inc/install-functions.php:63:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1158:// @TODO Rewrite these two constants
-./inc/language/de.php:1174:// @TODO Rewrite these five constants
-./inc/language/de.php:852:// @TODO Are these constants longer used?
+./inc/language/de.php:1141:// @TODO Rewrite these two constants
+./inc/language/de.php:1156:// @TODO Rewrite these three constants
+./inc/language/de.php:309:     // @TODO Following two are unused?
+./inc/language/de.php:836:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function.
-./inc/language/holiday_de.php:50:// @TODO Rewrite these two constants to one
-./inc/language/rallye_de.php:114:// @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:46:// @TODO Rewrite these constants to one
 ./inc/language/sponsor_de.php:119:// @TODO Rewrite these four constants to one and use sprintf()
-./inc/libs/admins_functions.php:440:           // @TODO This can be, somehow, rewritten
+./inc/libs/admins_functions.php:434:           // @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:58:               // @TODO Try to rewrite the following unset()
-./inc/libs/bonus_functions.php:216:                    // @TODO Try to find a way for rewriting this constant
-./inc/libs/bonus_functions.php:304:            // @TODO This query isn't right, it will only update if the user was for a longer time away!
+./inc/libs/bonus_functions.php:206:            // @TODO Move this HTML to a template
+./inc/libs/bonus_functions.php:290:            // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/libs/doubler_functions.php:46:// @TODO Lame description
-./inc/libs/rallye_functions.php:719:   $EXPIRE = 3; // @TODO The hard-coded value...
-./inc/libs/rallye_functions.php:783:           // @TODO Rewrite this to our API function
+./inc/libs/doubler_functions.php:94:                   // @TODO Can't this be moved into EL?
+./inc/libs/mailid_functions.php:49:            // @TODO Rewrite this to a dynamic include or so
+./inc/libs/rallye_functions.php:700:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
+./inc/libs/rallye_functions.php:768:   $EXPIRE = 3; // @TODO The hard-coded value...
+./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:61:           // @TODO Try to rewrite the following unset()
-./inc/libs/register_functions.php:287: // @TODO Rewrite these all to a single filter
-./inc/libs/register_functions.php:363: // @TODO Rewrite this to a filter
-./inc/libs/register_functions.php:370: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
-./inc/libs/register_functions.php:371: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-./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:245:             // @TODO These can be rewritten to filter
+./inc/libs/register_functions.php:296: // @TODO Rewrite these all to a single filter
+./inc/libs/register_functions.php:372: // @TODO Rewrite this to a filter
+./inc/libs/register_functions.php:379: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
+./inc/libs/register_functions.php:380: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
+./inc/libs/surfbar_functions.php:1541:         // @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:713:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/surfbar_functions.php:957:  // @TODO Invalid salt should be refused
+./inc/libs/task_functions.php:241:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
-./inc/libs/user_functions.php:138:     // @TODO These two constants are no longer used, maybe we reactivate this code?
-./inc/libs/user_functions.php:225:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:317:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:337:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:413:     // @TODO We should try to rewrite this to fetchUserData() somehow
+./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
+./inc/libs/user_functions.php:146:     // @TODO These two constants are no longer used, maybe we reactivate this code?
+./inc/libs/user_functions.php:234:// @TODO Double-check configuration entry here
+./inc/libs/user_functions.php:326:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:346:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:422:     // @TODO We should try to rewrite this to fetchUserData() somehow
 ./inc/libs/yoomedia_functions.php:116: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:77:      // @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:254:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:259:                         // @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:325:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:331:                                                 // @TODO ACL is 'allow'... hmmm
-./inc/modules/admin/admin-inc.php:431:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
-./inc/modules/admin/admin-inc.php:445:         // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
+./inc/modules/admin/admin-inc.php:261:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:266:                         // @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:332:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:338:                                                 // @TODO ACL is 'allow'... hmmm
+./inc/modules/admin/admin-inc.php:438:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
 ./inc/modules/admin/overview-inc.php:164:                              // @TODO Rewrite this to a filter
-./inc/modules/admin/overview-inc.php:278:                              // @TODO Rewrite this to something with include files and/or filter
-./inc/modules/admin/overview-inc.php:316:                                              // @TODO This may also be rewritten to include files
-./inc/modules/admin/overview-inc.php:318:                                                      default: // @TODO Unknown support mode
-./inc/modules/admin/overview-inc.php:439:                      // @TODO Try to move this in includes
+./inc/modules/admin/overview-inc.php:277:                              // @TODO Rewrite this to something with include files and/or filter
+./inc/modules/admin/overview-inc.php:315:                                              // @TODO This may also be rewritten to include files
+./inc/modules/admin/overview-inc.php:317:                                                      default: // @TODO Unknown support mode
+./inc/modules/admin/overview-inc.php:432:                      // @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:45:// @TODO This function does also check for uncompleted tasks
 ./inc/modules/admin/what-add_guestnl_cat.php:49:       // @TODO Check if category does already exist
 ./inc/modules/admin/what-add_surfbar_url.php:57:       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData
 ./inc/modules/admin/what-admin_add.php:61:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-admin_add.php:77:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-adminedit.php:58:     // @TODO Kill all constants in this file
-./inc/modules/admin/what-admins_mails.php:61:                          // @TODO Can this be rewritten???
+./inc/modules/admin/what-admins_mails.php:61:                          // @TODO Can this be rewritten to an API function?
 ./inc/modules/admin/what-bonus.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-config_admins.php:146:        // @TODO Rewrite this to filter 'run_sqls'
-./inc/modules/admin/what-config_mods.php:141:          // @TODO Rewritings: mod->module in template
+./inc/modules/admin/what-config_admins.php:126:        // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-config_mods.php:57:                   // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
-./inc/modules/admin/what-config_rallye_prices.php:209:                         // @TODO Rewritings: level->price_level, infos->info in template
-./inc/modules/admin/what-config_rallye_prices.php:226:                 // @TODO Rewrite these two constants
-./inc/modules/admin/what-config_register.php:78:       // @TODO Move this HTML code into a template
+./inc/modules/admin/what-config_points.php:113:                        // @TODO Rewrite this to a filter
+./inc/modules/admin/what-config_rallye_prices.php:197:                 // @TODO Rewrite these two constants
+./inc/modules/admin/what-config_register.php:77:       // @TODO Move this HTML code into a template
+./inc/modules/admin/what-del_email.php:60:             // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+./inc/modules/admin/what-del_email.php:61:             // @TODO Unused: cat_id, payment_id
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-extensions.php:348:                                           // @TODO Rewrite this to a filter
+./inc/modules/admin/what-extensions.php:277:                           // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver
+./inc/modules/admin/what-extensions.php:356:                                           // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-guest_add.php:137:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-guest_add.php:69:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-guest_add.php:85:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment
-./inc/modules/admin/what-list_autopurge.php:55:// @TODO Rewrite those lines to filter
-./inc/modules/admin/what-list_autopurge.php:85:                // @TODO Rewritings: surname->surname,family->family in templates
-./inc/modules/admin/what-list_cats.php:56:             // @TODO No longer needed? define('__CATS_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter
+./inc/modules/admin/what-list_bonus.php:134:           // @TODO Can't this be moved into our expression language?
+./inc/modules/admin/what-list_cats.php:56:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_cats.php:71:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:57:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:89:                            // @TODO Find a way to rewrite this. See some lines above for different queries
 ./inc/modules/admin/what-list_links.php:98:                                    // @TODO Rewrite this to includes/filter
-./inc/modules/admin/what-list_payouts.php:118:                                         // @TODO Do we need this time-consuming eval() here?
-./inc/modules/admin/what-list_rallyes.php:258:                 // @TODO Rewritings: opoints->curr_points,old->refs in template
-./inc/modules/admin/what-list_sponsor.php:149:                 // @TODO Rewritings: surname->surname,family->family,ip->remote_addr in template
-./inc/modules/admin/what-list_task.php:146:            // @TODO Rewrite these templates to one and add $OUT
-./inc/modules/admin/what-list_task.php:180:                    // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
-./inc/modules/admin/what-list_task.php:192:                            // @TODO Rewrite this to $OUT .= ..., true, ...
-./inc/modules/admin/what-list_task.php:196:                            // @TODO Rewrite this to $OUT .= ..., true, ...
+./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:100:             // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-./inc/modules/admin/what-list_unconfirmed.php:130:                             // @TODO Rewritings: userid->userid
-./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+./inc/modules/admin/what-list_unconfirmed.php:77:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 ./inc/modules/admin/what-list_unconfirmed.php:88:      // @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:160:            // @TODO Rewrite these to filters
-./inc/modules/admin/what-list_user.php:287:            // @TODO Rewrite this into a  filter
-./inc/modules/admin/what-list_user.php:341:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:151:            // @TODO Rewrite these to filters
+./inc/modules/admin/what-list_user.php:257:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:300:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:126:                              // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-mem_add.php:65:               // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-mem_add.php:81:               // @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-payments.php:152:                     // @TODO Rewritings: title->mail_title, pay->payment in template
-./inc/modules/admin/what-refbanner.php:145:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
+./inc/modules/admin/what-payments.php:148:                     // @TODO Rewritings: title->mail_title in template
+./inc/modules/admin/what-refbanner.php:143:                    // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template
 ./inc/modules/admin/what-unlock_emails.php:89:                                 // @TODO Rewrite these if-blocks to a filter
-./inc/modules/admin/what-unlock_sponsor.php:192:               // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template
 ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
 ./inc/modules/admin/what-usr_online.php:51:    // @TODO Add a filter for sponsor
-./inc/modules/guest/what-beg.php:60:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
-./inc/modules/guest/what-confirm.php:113:                                      // @TODO Try to rewrite the following unset()
-./inc/modules/guest/what-login.php:108:        // @TODO Move this HTML code into a template
+./inc/modules/guest/what-beg.php:53:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
+./inc/modules/guest/what-confirm.php:120:                                      // @TODO Try to rewrite the following unset()
+./inc/modules/guest/what-login.php:114:        // @TODO Move this HTML code into a template
 ./inc/modules/guest/what-mediadata.php:183:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:70:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:91:       // @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_infos.php:70:         // @TODO Rewritings: conv->conv_rate,name->conv_name in template
-./inc/modules/guest/what-sponsor_infos.php:90:                 // @TODO Rewritings: name->pay_name,min->pay_min_count,min->pay_min_count,curr->pay_currency
-./inc/modules/guest/what-sponsor_reg.php:287:          // @TODO Swap this HTML code to templates
+./inc/modules/guest/what-sponsor_reg.php:290:          // @TODO Swap this HTML code to templates
 ./inc/modules/guest/what-stats.php:116:                // @TODO This can be somehow rewritten
 ./inc/modules/guest/what-stats.php:76:// @TODO This can be rewritten in a dynamic include
-./inc/modules/member/what-beg.php:64:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
+./inc/modules/member/what-beg.php:56:// @TODO Can't this be moved into EL?
+./inc/modules/member/what-beg.php:65:// @TODO No more needed? define('__BEG_UID_TIMEOUT', createFancyTime(getConfig('beg_userid_timeout')));
 ./inc/modules/member/what-bonus.php:57:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
-./inc/modules/member/what-doubler.php:56:// @TODO The '*100' is in the way to get moved into the template
-./inc/modules/member/what-order.php:453:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:457:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter
-./inc/modules/member/what-payout.php:221:                                      // @TODO Rewrite this to a filter
+./inc/modules/member/what-payout.php:216:                                      // @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:91:      // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
+./inc/modules/member/what-refback.php:126:                     // @TODO UNUSED: $refRow['status']      = translateUserStatus($refRow['status']);
 ./inc/modules/member/what-reflinks.php:54:// @TODO Move this into a filter
-./inc/modules/member/what-stats.php:119:               // @TODO Rewrite in template: clix->clicks
-./inc/modules/member/what-transfer.php:136:                            // @TODO Rewrite this to a filter
-./inc/modules/member/what-transfer.php:226:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
-./inc/modules/member/what-transfer.php:311:                    // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
-./inc/modules/member/what-transfer.php:317:                            // @TODO Rewrite: tid->trans_id,stamp->time_trans
+./inc/modules/member/what-stats.php:74:                // @TODO More usage of EL at this array
+./inc/modules/member/what-themes.php:116:      // @TODO Move this code into a template
+./inc/modules/member/what-transfer.php:132:                            // @TODO Rewrite this to a filter
+./inc/modules/member/what-transfer.php:222:                            // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
+./inc/modules/member/what-transfer.php:304:                    // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
+./inc/modules/member/what-transfer.php:310:                            // @TODO Rewrite: tid->trans_id,stamp->time_trans
 ./inc/modules/member/what-transfer.php:94:                     // @TODO Rewrite this to a filter
 ./inc/modules/member/what-unconfirmed.php:143: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:76:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:69:    // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1579:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-./inc/mysql-manager.php:1677:  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2121:                  // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2162:// @TODO Fix inconsistency between last_module and getWhat()
+./inc/mysql-manager.php:1630:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/mysql-manager.php:1730:  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2110:                  // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2154:// @TODO Fix inconsistency between last_module and getWhat()
 ./inc/mysql-manager.php:229:                   // @TODO Nothing helped???
 ./inc/mysql-manager.php:264:                   // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:557:   // @TODO Try to rewrite this to one or more functions
+./inc/mysql-manager.php:589:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:94:// @TODO Can we cache this?
 ./inc/reset/reset_beg.php:51:// @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/reset/reset_birthday.php:91:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/revision-functions.php:153:// @TODO Please describe this function
+./inc/template-functions.php:1155:     // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1188:             // @TODO Add a little more infos here
+./inc/template-functions.php:1473:// @TODO Lame description for this function
+./inc/template-functions.php:1492:                     // @TODO Move this in a filter
+./inc/template-functions.php:280:      // @TODO Remove this sanity-check if all is fine
+./inc/template-functions.php:595:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:622:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/wrapper-functions.php:127:// @TODO Implement $compress
 ./inc/wrapper-functions.php:134:// @TODO Implement $decompress
-./inc/wrapper-functions.php:428:// @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:455:// @TODO Do some more sanity check here
+./mailid.php:138:                                      // @TODO Rewrite this to a filter
 ./mailid.php:95:               // @TODO Rewrite this to a filter
-./mailid_top.php:100:          // @TODO Rewrite this to a filter
-./mailid_top.php:136:                                  // @TODO Rewrite this to a filter
-./mailid_top.php:183:                                                  // @TODO Rewrite this to a filter
-./mailid_top.php:190:                                                                  // @TODO Rewrite this to a filter
-./mailid_top.php:226:                                                                  // @TODO Rewrite these blocks to filter
-./mailid_top.php:261:                                                                          // @TODO Try to rewrite the following unset()
+./mailid_top.php:132:                                  // @TODO Rewrite this to a filter
+./mailid_top.php:179:                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:186:                                                                  // @TODO Rewrite this to a filter
+./mailid_top.php:222:                                                                  // @TODO Rewrite these blocks to filter
+./mailid_top.php:257:                                                                          // @TODO Try to rewrite the following unset()
+./mailid_top.php:99:           // @TODO Rewrite this to a filter
+./show_bonus.php:107:                  // @TODO No more needed? $content['points'] = translateComma($content['points']);
 ./view.php:70:         // @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_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:35:     @TODO Doesn't work with sessions
-./templates/de/html/admin/admin_login_form.tpl:38:             @TODO Try to move the select box to our generic functions
+./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_mods_edit.tpl:3:       <!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_optimize.tpl:3:        <!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_send_bonus_form.tpl:4: <!-- @TODO Maybe add some title? //-->
 ./templates/de/html/guest/guest_login.tpl:21:  @TODO Deactivated feature, try to implement it or remove it.
 ./templates/de/html/guest/guest_nickname_login.tpl:21: @TODO Deactivated feature, try to find a solution for this or remove it.
 ./templates/de/html/guest/guest_stats_member.tpl:21:   @TODO We have to fix these counters.
+./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) //-->
-./templates/de/html/surfbar/surfbar_frame_top.tpl:23:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
+./templates/de/html/surfbar/surfbar_frame_top.tpl:32:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy)
 ### ### DEPRECATION FOLLOWS: ### ###
-./inc/modules/admin/admin-inc.php:432:// @DEPRECATED
+./inc/modules/admin/admin-inc.php:439:// @DEPRECATED
+./templates/de/html/admin/admin_list_theme_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_theme.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_overview_footer_task.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_overview_footer.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_overview_header_task.tpl:1:<!-- @DEPRECATED //-->
 ### ### template-warnings.log follows: ### ###
-Warning: 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 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_order_points.tpl, line: 14 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
-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_cookies_disabled.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl.
+Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.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 : 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(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in 
-Warning: DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 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 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 12 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 6 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 7 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_footer.tpl, line: 11 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
+Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
+Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home
+PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/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(): 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