X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=DOCS%2FTODOs.txt;h=6488912587ea4fe9b4f3ce264a08bea2576af34a;hb=1dfd89652afd8c4542e791a5d90315019365e962;hp=20aa9a9232bc9ec89044720de04a41236f672c81;hpb=96a270e713e9bc75a6199ff76d5f4831b732ff15;p=mailer.git

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 20aa9a9232..6488912587 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -9,7 +9,7 @@
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:99:			// @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/email-functions.php:109: * @TODO Rewrite this to an extension 'smtp'
-./inc/email-functions.php:227:// @TODO $rawUserId is currently unused
+./inc/email-functions.php:205:// @TODO $rawUserId is currently unused
 ./inc/expression-functions.php:173:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:46:	// @TODO is escapeQuotes() enough for strings with single/double quotes?
 ./inc/extensions/ext-html_mail.php:136:		// @TODO Move these arrays into config
@@ -43,34 +43,34 @@
 ./inc/extensions/ext-network.php:43: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
 ./inc/extensions/ext-newsletter.php:218:		// @TODO Move these into configuration
 ./inc/extensions/ext-nickname.php:52:		// @TODO NOT NULL DEFAULT '' is bad practice, use NULL
-./inc/extensions/ext-rallye.php:94:		// @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:2119:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:2176:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 ./inc/extensions-functions.php:424:	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
 ./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:580:		// @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:94:		// @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
 ./inc/filter/forced_filter.php:73:		// @TODO This part is unfinished
-./inc/filters.php:1313:			// @TODO No banner found, output some default banner
-./inc/functions.php:1102:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1188:			// @TODO Are these convertions still required?
-./inc/functions.php:1209:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:1814:	// @TODO Find a way to cache this
-./inc/functions.php:1919:	// @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2126:	// @TODO Rename column data_type to e.g. mail_status
-./inc/functions.php:2476:// @TODO cacheFiles is not yet supported
+./inc/filters.php:1317:		// @TODO No banner found, output some default banner
+./inc/functions.php:1104:			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1190:			// @TODO Are these convertions still required?
+./inc/functions.php:1211:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1816:	// @TODO Find a way to cache this
+./inc/functions.php:1920:	// @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2124:	// @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2474:// @TODO cacheFiles is not yet supported
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
-./inc/install-functions.php:91:	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1139:	// @TODO Rewrite these two constants
-./inc/language/de.php:1155:	// @TODO Rewrite these three constants
+./inc/install-functions.php:402:	// @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
+./inc/install-functions.php:97:	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
+./inc/language/de.php:1147:	// @TODO Rewrite these two constants
+./inc/language/de.php:1163:	// @TODO Rewrite these three constants
 ./inc/language/de.php:46:	// @TODO Please sort these language elements
-./inc/language/de.php:735:// @TODO Are these constants longer used?
+./inc/language/de.php:741:// @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/install_de.php:137:	// @TODO Move this to e.g. ext-smtp
+./inc/language/install_de.php:140:	// @TODO Move this to e.g. ext-smtp
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/language/order_de.php:70:	// @TODO Find better text
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
@@ -89,8 +89,9 @@
 ./inc/libs/rallye_functions.php:983:		// Load count @TODO Can't we rewrite this to our API?
 ./inc/libs/sponsor_functions.php:163:					// @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:436:			// @TODO Rewrite this to API function
-./inc/libs/surfbar_functions.php:1692:		// @TODO This can be somehow rewritten
-./inc/libs/surfbar_functions.php:789:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/surfbar_functions.php:1696:		// @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:479:		// @TODO if (($urlData['url_views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
+./inc/libs/surfbar_functions.php:790:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/task_functions.php:256:		// @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:96:	// @TODO Can't this be rewritten to an API function?
@@ -121,9 +122,7 @@
 ./inc/modules/admin/what-adminedit.php:56:	// @TODO Kill all constants in this file
 ./inc/modules/admin/what-admins_mails.php:58:				// @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_mods.php:55:			// @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
-./inc/modules/admin/what-config_points.php:130:				// @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter
-./inc/modules/admin/what-config_rallye_prices.php:222:			// @TODO Rewrite these two constants
+./inc/modules/admin/what-config_points.php:90:				// @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter
 ./inc/modules/admin/what-config_register.php: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                                    *
@@ -135,14 +134,16 @@
 ./inc/modules/admin/what-holiday_list.php:46:// @TODO Unused at the moment
 ./inc/modules/admin/what-list_admins_acls.php:126:	// @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:137:		// @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:68:				// @TODO Rewrite this to countSum.....() function
+./inc/modules/admin/what-list_bonus.php:136:		// @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_links.php:96:					// @TODO Rewrite this to includes/filter
+./inc/modules/admin/what-list_mods.php:55:			// @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
+./inc/modules/admin/what-list_rallye_prices.php:222:			// @TODO Rewrite these two constants
 ./inc/modules/admin/what-list_refs.php:101:							// @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:114:	// @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_unconfirmed.php:87:	// @TODO `id` has been used two times???
+./inc/modules/admin/what-list_user_cats.php:54:		// @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_user_cats.php:68:				// @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_user.php:104:		// @TODO Refacture these old link generation to functions
 ./inc/modules/admin/what-list_user.php:121:		// @TODO Refacture birth_foo to avoid uni* timetstamps as older members cannot be greeded correctly
 ./inc/modules/admin/what-list_user.php:291:		// @TODO Rewrite this into a filter
@@ -183,8 +184,8 @@
 ./inc/mysql-manager.php:1464:	// @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1770:			// @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1967:				// @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-./inc/mysql-manager.php:2079:			// @TODO Used generic 'userid' here
-./inc/mysql-manager.php:2300:// @TODO cacheFiles is not yet supported
+./inc/mysql-manager.php:2090:			// @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2311:// @TODO cacheFiles is not yet supported
 ./inc/mysql-manager.php:398:	// @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:	// @TODO Rewrite these if() blocks to a filter
@@ -193,14 +194,14 @@
 ./inc/template-functions.php:1145:			// @TODO Deprecate this thing
 ./inc/template-functions.php:1252:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
 ./inc/template-functions.php:1301:		// @TODO Add a little more infos here
-./inc/template-functions.php:1676:// @TODO Lame description for this function
-./inc/template-functions.php:1698:			// @TODO Move this in a filter
+./inc/template-functions.php:1667:// @TODO Lame description for this function
+./inc/template-functions.php:1689:			// @TODO Move this in a filter
 ./inc/template-functions.php:200:	 * @TODO On some pages this is buggy
-./inc/template-functions.php:2313:	// @TODO Is this needed for e.g. $GLOBALS['template_content'] ? $this->setRawTemplateData($compactedContent);
+./inc/template-functions.php:2323:	// @TODO Is this needed for e.g. $GLOBALS['template_content'] ? $this->setRawTemplateData($compactedContent);
 ./inc/template-functions.php:288:	// @TODO Remove these sanity checks if all is fine
 ./inc/template-functions.php:625:// @TODO $simple/$constants are deprecated
 ./inc/template-functions.php:723:			// @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
-./inc/wrapper-functions.php:2970:	// @TODO Find a way to not use direct module comparison
+./inc/wrapper-functions.php:3020:	// @TODO Find a way to not use direct module comparison
 ./inc/wrapper-functions.php:512:// @TODO Do some more sanity check here
 ./inc/xml-functions.php:240:	// @TODO Handle characters
 ./mailid.php:102:		// @TODO Rewrite this to a filter
@@ -248,6 +249,9 @@
 ./inc/modules/admin/what-admins_contact.php:2:// @DEPRECATED
 ./inc/modules/admin/what-autopurge.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_cache.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_cats.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_mods.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_rallye_prices.php:2:// @DEPRECATED
 ./inc/modules/admin/what-config_reg.php:2:// @DEPRECATED
 ./inc/modules/admin/what-del_task.php:2:// @DEPRECATED
 ./inc/modules/admin/what-list_newsletter.php:2:// @DEPRECATED
@@ -267,6 +271,7 @@
 ./inc/sql_error.php:2:// @DEPRECATED
 ./inc/stats_bonus.php:2:// @DEPRECATED
 ./inc/template.php:2:// @DEPRECATED
+./templates/de/html/admin/admin_add_reflevel.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_add_reflvl.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_add_shop_cat.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_admins_contact_form.tpl:1:<!-- @DEPRECATED //-->
@@ -279,6 +284,8 @@
 ./templates/de/html/admin/admin_config_reg_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_shop.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_transfer_pro.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_edit_reflevel_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_edit_reflevel.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_installed.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_list.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_extensions_search.tpl:1:<!-- @DEPRECATED //-->
@@ -288,6 +295,8 @@
 ./templates/de/html/admin/admin_forum_edit_del.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_forum_edit_forum.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_holiday_task.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_reflevel_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_list_reflevel.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_list_unconfirmed_header.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_logout_sql_patches.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_mods_footer_list.tpl:1:<!-- @DEPRECATED //-->
@@ -314,6 +323,7 @@
 ./templates/de/html/guest/guest_paidlinks_register_header.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/guest/guest_paidlinks_register.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/install/install_header.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/metadata.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_one.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_select_box.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_select_form.tpl:1:<!-- @DEPRECATED //-->
@@ -325,14 +335,10 @@ PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/
 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 : strong in templates/de/html/admin/admin_list_user_subid_row.tpl, line: 3 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_delete_user_subids_row.tpl, line: 4 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_edit_user_subids_row.tpl, line: 4 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: 8 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 9 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/admin/admin_list_user_subid_stats.tpl, line: 32 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in