From: Roland Häder <roland@mxchange.org>
Date: Sat, 1 Jun 2013 17:17:05 +0000 (+0000)
Subject: Renamed templates + added some filters for mail order
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=6d08952d672c5a5de7d8522f894a5665599a2a4a

Renamed templates + added some filters for mail order
---

diff --git a/.gitattributes b/.gitattributes
index 10b9228454..fb60ceb11c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -260,6 +260,8 @@ inc/extensions/forced/.htaccess svneol=native#text/plain
 inc/extensions/forced/mode-setup.php svneol=native#text/plain
 inc/extensions/holiday/.htaccess svneol=native#text/plain
 inc/extensions/holiday/mode-update.php svneol=native#text/plain
+inc/extensions/html_mail/.htaccess svneol=native#text/plain
+inc/extensions/html_mail/mode-update.php svneol=native#text/plain
 inc/extensions/network/.htaccess svneol=native#text/plain
 inc/extensions/network/mode-setup.php svneol=native#text/plain
 inc/extensions/order/.htaccess svneol=native#text/plain
@@ -1023,6 +1025,9 @@ templates/de/emails/admin/admin_sponsor_settings.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_depleted.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_surfbar_url_active_pending.tpl svneol=native#text/plain
@@ -1147,6 +1152,9 @@ templates/de/emails/member/member_sub_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-ordr.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-reflink.tpl svneol=native#text/plain
 templates/de/emails/member/member_support-unconfirmed.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_ordr.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_reflink.tpl svneol=native#text/plain
+templates/de/emails/member/member_support_unconfirmed.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_low_points.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_deleted.tpl svneol=native#text/plain
 templates/de/emails/member/member_surfbar_url_active_pending.tpl svneol=native#text/plain
diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 9c5107be24..46a5135a6e 100644
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -1,4 +1,4 @@
-### WARNING: THIS FILE IS AUTO-GENERATED BY ../../contrib/todo-builder.sh (uid=/user=quix0r) ###
+### WARNING: THIS FILE IS AUTO-GENERATED BY ../../contrib/todo-builder.sh (uid=1000/user=quix0r) ###
 ### DO NOT EDIT THIS FILE. ###
 ./api.php:68:// @TODO Do stuff here
 ./autoreg.php:62:// @TODO Add processing of request here
@@ -6,26 +6,36 @@
 ./cron.php:62:// @TODO Do stuff here
 ./inc/classes/cachesystem.class.php:516:	// @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:151:	// @TODO Make this all better... :-/
-./inc/config-functions.php:328:					// @TODO Call setConfigEntry() somehow
-./inc/config-functions.php:356:		// @TODO Call setConfigEntry() somehow
+./inc/config-functions.php:329:					// @TODO Call setConfigEntry() somehow
+./inc/config-functions.php:359:		// @TODO Call setConfigEntry() somehow
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
-./inc/daily/daily_birthday.php:68:// @TODO Rewrite these if() blocks to a filter
+./inc/daily/daily_birthday.php:63:// @TODO Move this out to an extension
 ./inc/email-functions.php:113: * @TODO Rewrite this to an extension 'smtp'
 ./inc/email-functions.php:209:// @TODO $rawUserId is currently unused
 ./inc/expression-functions.php:173:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:46:	// @TODO is escapeQuotes() enough for strings with single/double quotes?
+./inc/extensions-functions.php:2239:			// @TODO Is this really neccessary?
+./inc/extensions-functions.php:2296:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:439:	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
+./inc/extensions-functions.php:455:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:595:		// @TODO Extension is loaded, what next?
+./inc/extensions/admins/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/autopurge/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/beg/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/bonus/mode-update.php:43:// @TODO Remove double tabs from all lines
-./inc/extensions/ext-html_mail.php:149:		// @TODO Move these arrays into config
+./inc/extensions/doubler/mode-setup.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/doubler/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/ext-html_mail.php:91:		// @TODO Move these arrays into config
 ./inc/extensions/ext-menu.php:52:		// @TODO Convert menu-Id to one coding-standard. admin(edit|_add) => admin_menu_(edit|add), mem(edit|_add) => (edit|add)_(admin|guest|member)_menu
 ./inc/extensions/ext-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-ranking.php:18: * @TODO Replaces ext-top10                                             *
+./inc/extensions/ext-rewrite.php:50:// @TODO Only when 'seo' is ready: setExtensionDeprecated('Y');
+./inc/extensions/ext-top10.php:50:// @TODO Only deprecated when 'ext-ranking' is ready: setExtensionDeprecated('Y');
 ./inc/extensions/ext-yoomedia.php:120:		// @TODO Can this be moved into a database table?
-./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:2184:			// @TODO Is this really neccessary?
-./inc/extensions-functions.php:2235:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
-./inc/extensions-functions.php:439:	// @TODO This redirect is still needed to register sql_patches! Please try to avoid it
-./inc/extensions-functions.php:455:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:595:		// @TODO Extension is loaded, what next?
+./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready: setExtensionDeprecated('Y');
+./inc/extensions/forced/mode-setup.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/html_mail/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/network/mode-setup.php:18: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
 ./inc/extensions/network/mode-setup.php:19: * @TODO ADCocktail: Zero array element is return code!                 *
 ./inc/extensions/network/mode-setup.php:20: * @TODO adgain.de: Textlink-View is a JavaScript URL                   *
@@ -59,35 +69,41 @@
 ./inc/extensions/network/mode-setup.php:48: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
 ./inc/extensions/network/mode-setup.php:94:// @TODO network_type_handler is an internal name and needs documentation
 ./inc/extensions/order/mode-update.php:43:// @TODO Remove double-tab from all lines
+./inc/extensions/other/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/payout/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/rallye/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/register/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/sponsor/mode-setup.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/sql_patches/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/surfbar/mode-setup.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/task/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/transfer/mode-setup.php:43:// @TODO Remove double tabs from all lines
+./inc/extensions/transfer/mode-update.php:43:// @TODO Remove double tabs from all lines
 ./inc/extensions/user/mode-update.php:43:// @TODO Remove double tabs from all lines
+./inc/filter-functions.php:120:	// @TODO Remove this forced removal after a year or so
 ./inc/filter/blacklist_filter.php:105:	// @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:116:	// @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:127:	// @TODO Insert log entry
 ./inc/filter/bonus_filter.php:56:		// @TODO This query isn't right, it will only update if the user was for a longer time away!
-./inc/filter/forced_filter.php:73:		// @TODO This part is unfinished
-./inc/filter-functions.php:119:	// @TODO Remove this forced removal after a year or so
+./inc/filter/forced_filter.php:75:		// @TODO This part is unfinished
 ./inc/filter/order_filter.php:132:		// @TODO 200 is hard-coded here, swap it out to config + admin_config_order.tpl
-./inc/filters.php:1370:		// @TODO No banner found, output some default banner
+./inc/filters.php:1394:		// @TODO No banner found, output some default banner
 ./inc/functions.php:1210:			// @TODO Are these convertions still required?
 ./inc/functions.php:1231:// @TODO Rewrite this function to use readFromFile() and writeToFile()
 ./inc/functions.php:1535:		// @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
-./inc/functions.php:1896:	// @TODO Find a way to cache this
-./inc/functions.php:2000:	// @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2204:	// @TODO Rename column data_type to e.g. mail_status
-./inc/functions.php:2554:// @TODO cacheFiles is not yet supported
-./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
+./inc/functions.php:1911:	// @TODO Find a way to cache this
+./inc/functions.php:2015:	// @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2219:	// @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2569:// @TODO cacheFiles is not yet supported
+./inc/gen_sql_patches.php:97:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
-./inc/install-functions.php:446:	// @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
-./inc/install-functions.php:97:	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1163:	// @TODO Rewrite these two constants
-./inc/language/de.php:1179:	// @TODO Rewrite these three constants
-./inc/language/de.php:46:	// @TODO Please sort these language elements
-./inc/language/de.php:748:// @TODO Are these constants longer used?
+./inc/install-functions.php:107:	// @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
+./inc/install-functions.php:456:	// @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
 ./inc/language-functions.php:254:	// @TODO These are all valid languages, again hard-coded
-./inc/language/install_de.php:142:	// @TODO Move this to e.g. ext-smtp
+./inc/language/de.php:1150:	// @TODO Rewrite these two constants
+./inc/language/de.php:1166:	// @TODO Rewrite these three constants
+./inc/language/de.php:46:	// @TODO Please sort these language elements
+./inc/language/install_de.php:153:	// @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:71:	// @TODO Find better text
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
@@ -98,7 +114,7 @@
 ./inc/libs/doubler_functions.php:130:// @TODO This could be rewritten to a filter
 ./inc/libs/doubler_functions.php:44:// @TODO Lame description
 ./inc/libs/doubler_functions.php:96:			// @TODO Can't this be moved into EL?
-./inc/libs/forced_functions.php:457:// @TODO Can't we use our new expression language instead of this ugly code?
+./inc/libs/forced_functions.php:458:// @TODO Can't we use our new expression language instead of this ugly code?
 ./inc/libs/mailid_functions.php:123:	// @TODO Rewrite these blocks to filter
 ./inc/libs/mailid_functions.php:47:		// @TODO Rewrite this to a dynamic include or so
 ./inc/libs/mailid_functions.php:93:	// @TODO Rewrite this to a filter
@@ -112,10 +128,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:1696:		// @TODO This can be somehow rewritten
+./inc/libs/surfbar_functions.php:1695:		// @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:258:		// @TODO This 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?
 ./inc/libs/user_functions.php:325:			// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
@@ -123,18 +138,15 @@
 ./inc/libs/yoomedia_functions.php:108:	$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-extension.php:13: * @TODO Rewrite this whole file                                        *
-./inc/mails/beg_mails.php:84:	// @TODO Rewrite these if() blocks to a filter
-./inc/mails/bonus_mails.php:84:	// @TODO Rewrite these if() blocks to a filter
 ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten to a filter?
-./inc/mails/doubler_mails.php:75:// @TODO Rewrite these if() blocks to a filter
 ./inc/module-functions.php:273:			// @TODO Nothing helped???
 ./inc/module-functions.php:314:			// @TODO Rewrite this to a filter
-./inc/modules/admin/admin-inc.php:1055:// @TODO rawUserId/content is not yet supported
-./inc/modules/admin/admin-inc.php:1080:// @TODO rawUserId/cacheFiles/content is not yet supported
-./inc/modules/admin/admin-inc.php:175:		// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
-./inc/modules/admin/admin-inc.php:248:		// @TODO This can be rewritten into a filter
-./inc/modules/admin/admin-inc.php:533:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
-./inc/modules/admin/admin-inc.php:880:// @TODO cacheFiles is not yet supported
+./inc/modules/admin/admin-inc.php:1058:// @TODO rawUserId/content is not yet supported
+./inc/modules/admin/admin-inc.php:1083:// @TODO rawUserId/cacheFiles/content is not yet supported
+./inc/modules/admin/admin-inc.php:178:		// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
+./inc/modules/admin/admin-inc.php:251:		// @TODO This can be rewritten into a filter
+./inc/modules/admin/admin-inc.php:536:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:883:// @TODO cacheFiles is not yet supported
 ./inc/modules/admin/overview-inc.php:176:				// @TODO Rewrite this to a filter
 ./inc/modules/admin/overview-inc.php:285:				// @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:319:						// @TODO This may also be rewritten to include files
@@ -159,19 +171,18 @@
 ./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:126:	// @TODO Rewrite this to filter 'run_sqls'
-./inc/modules/admin/what-list_autopurge.php:54:// @TODO Rewrite this as a filter
 ./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:115:	// @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-./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:288:		// @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:350:			// @TODO Rewrite this into a filter
+./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-logs.php:64:			// @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:			// @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:124:				// @TODO This can be somehow rewritten to a function
@@ -194,9 +205,9 @@
 ./inc/modules/member/what-logout.php:17: * @TODO Rewrite the code to a filter                                   *
 ./inc/modules/member/what-logout.php:52:	// @TODO Move this in a filter, e.g. member_logout
 ./inc/modules/member/what-mydata.php:82:		// @TODO Move this to a function (for better EL code)
-./inc/modules/member/what-order.php:317:			// @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:300:			// @TODO Rewrite this to a filter
 ./inc/modules/member/what-order.php:72:	// @TODO Try to move out url_tlock to a filter for extra SQL statements
-./inc/modules/member/what-payout.php:208:					// @TODO Rewrite this to a filter
+./inc/modules/member/what-payout.php:223:					// @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:61:// @TODO Should we rewrite this to a filter?
 ./inc/modules/member/what-rallyes.php:99:	// @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 ./inc/modules/member/what-reflinks.php:52:// @TODO Move this into a filter
@@ -213,23 +224,23 @@
 ./inc/mysql-manager.php:1535:	// @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1851:			// @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:2019:				// @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:2142:			// @TODO Used generic 'userid' here
-./inc/mysql-manager.php:2360:// @TODO cacheFiles is not yet supported
+./inc/mysql-manager.php:2151:			// @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2369:// @TODO cacheFiles is not yet supported
 ./inc/mysql-manager.php:408:	// @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/pool-functions.php:44:// @TODO "Hook" ext-html_mail into this to allow column `html_msg`
 ./inc/revision-functions.php:168:// @TODO This function does also set and get in 'cache_array'
-./inc/template-functions.php:1048:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
-./inc/template-functions.php:1103:			// @TODO Deprecate this thing
-./inc/template-functions.php:1114:			// @TODO Deprecate this thing
-./inc/template-functions.php:1236:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1291:		// @TODO Add a little more infos here
-./inc/template-functions.php:1672:// @TODO Lame description for this function
-./inc/template-functions.php:1694:			// @TODO Move this in a filter
+./inc/template-functions.php:1052:				// @TODO <label for="' . $prefix . '_' . $field . '"></<label> not working here
+./inc/template-functions.php:1107:			// @TODO Deprecate this thing
+./inc/template-functions.php:1118:			// @TODO Deprecate this thing
+./inc/template-functions.php:1240:	// @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1295:		// @TODO Add a little more infos here
+./inc/template-functions.php:1694:// @TODO Lame description for this function
+./inc/template-functions.php:1716:			// @TODO Move this in a filter
 ./inc/template-functions.php:209:	 * @TODO On some pages this is buggy
 ./inc/template-functions.php:298:	// @TODO Remove these sanity checks if all is fine
-./inc/template-functions.php:747:			// @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
-./inc/wrapper-functions.php:3274:	// @TODO Find a way to not use direct module comparison
+./inc/template-functions.php:751:			// @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
+./inc/wrapper-functions.php:3286:	// @TODO Find a way to not use direct module comparison
 ./inc/wrapper-functions.php:583:// @TODO Do some more sanity check here
 ./inc/xml-functions.php:240:	// @TODO Handle characters
 ./mailid.php:123:		// @TODO Rewrite this to a filter/function
@@ -243,37 +254,28 @@
 ./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3:<!-- @TODO Shouldn't we add a 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/ext/ext_transaction.tpl:2:	@TODO Transaktionen ...
 ./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_list_unconfirmed_nopoints.tpl:12:		<!-- @TODO Nothing to say here? //-->
-./templates/de/html/surfbar/surfbar_frameset.tpl:4:	// @TODO This redirect kills our own frameset
+./templates/de/html/member/member_list_unconfirmed_nopoints.tpl:20:		<!-- @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-network/ext-sponsor) //-->
+./templates/de/html/surfbar/surfbar_frameset.tpl:4:	// @TODO This redirect kills our own frameset
 ./js/admin-network-query-api.js:72:// @TODO Add support for checkboxes
 ./js/admin-network-query-api.js:73:// @TODO Make progress window working
-./js/install-common.js:112:	// @TODO Progress bar is out-of-order: + '<div id="progressbar"></div>'
+./js/ajax-common.js:250:				// @TODO Need this be secured?
+./js/ajax-common.js:288:				// @TODO Need this be secured?
+./js/install-common.js:116:	// @TODO Progress bar is out-of-order: + '<div id="progressbar"></div>'
 ./.htaccess:10:	# @TODO When ext-imprint is finished RewriteRule ^modules.php?module=index&what=impressum$ modules.php?module=index&what=imprint [L]
 ./.htaccess:11:	# @TODO When ext-terms is finished RewriteRule ^cms/index/wht/agb$                 modules.php?module=index&what=terms [L]
 ./.htaccess:12:	# @TODO When ext-terms is finished RewriteRule ^modules.php?module=index&what=agb$ modules.php?module=index&what=terms [L]
 ./.htaccess:13:	# @TODO When ext-terms is finished RewriteRule ^agb.php$ modules.php?module=index&what=terms [L]
 ./.htaccess:9:	# @TODO When ext-imprint is finished RewriteRule ^cms/index/wht/impressum$                 modules.php?module=index&what=imprint [L]
 ### ### DEPRECATION FOLLOWS: ### ###
-./inc/modules/admin/admin-inc.php:534:// @DEPRECATED
-### ### template-warnings.log follows: ### ###
-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(): 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/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(): 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 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
+./inc/modules/admin/admin-inc.php:537:// @DEPRECATED
+./templates/de/emails/admin/admin_support-ordr.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_support-reflink.tpl:1:@DEPRECATED
+./templates/de/emails/admin/admin_support-unconfirmed.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_support-ordr.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_support-reflink.tpl:1:@DEPRECATED
+./templates/de/emails/member/member_support-unconfirmed.tpl:1:@DEPRECATED
diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 8dfde689bd..58127d2909 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -249,7 +249,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdate
 	initIncludePool('extension');
 
 	// By default there is no failure
-	enableExtensionReportingFailure();
+	enableExtensionReportingFailure(FALSE);
 
 	// Does this extension exists?
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . ' - CALLING loadExtension() ...');
@@ -1053,7 +1053,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
 		} // END - if
 	} else {
 		// Extension not there! :-(
-		reportBug(__FUNCTION__, __LINE__, sprintf("Extension <span class=\"data\">%s</span> not found but should be updated?", $ext_name));
+		reportBug(__FUNCTION__, __LINE__, sprintf('Extension <span class="data">%s</span> not found but should be updated?', $ext_name));
 	}
 
 	// Return task id
@@ -1063,7 +1063,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
 // Creates a new task for newly installed extension
 function createNewExtensionTask ($ext_name) {
 	// Generate subject line
-	$subject = sprintf("[%s:]", $ext_name);
+	$subject = sprintf('[%s:]', $ext_name);
 
 	// Get task id
 	$taskId = determineTaskIdBySubject($subject);
@@ -1487,8 +1487,8 @@ function incrementExtensionUpdateIterator () {
 	$GLOBALS['ext_depend_iterator'][getCurrentExtensionName()]++;
 }
 
-// Setter for EXT_REPORTS_FAILURE flag
-function enableExtensionReportingFailure ($reportsFailure = FALSE) {
+// Setter for EXT_REPORTS_FAILURE flag (default: extension reported installation failure)
+function enableExtensionReportingFailure ($reportsFailure = TRUE) {
 	$GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 
@@ -2053,7 +2053,7 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf('Double sponsor menu action=%s,what=%s,title=%s,active=%s detected.', $action, $what, $title, $active));
 	}
 }
 
@@ -2140,7 +2140,7 @@ function addExtensionChangeTableColumnSql ($tableName, $fromColumnName, $toColum
 	assert(($fromColumnName != $columnSql) && ($toColumnName != $columnSql));
 
 	// Is the column there?
-	if ((ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $fromColumnName)) && (($fromColumnName == $toColumnName) || (!ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $toColumnName, isInstaller())))) {
+	if ((ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $fromColumnName, isInstaller())) && (($fromColumnName == $toColumnName) || (!ifSqlTableColumnExists('{?_MYSQL_PREFIX?}_' . $tableName, $toColumnName, isInstaller())))) {
 		// Debug message
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',fromColumnName=' . $fromColumnName . ',toColumnName=' . $toColumnName . ',columnSql=' . $columnSql);
 
diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index d97d1cea2d..40c517ca7f 100644
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.2.2');
+setThisExtensionVersion('0.2.3');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3'));
 
 switch (getExtensionMode()) {
 	case 'setup': // Do stuff when installation is running
@@ -86,6 +86,8 @@ INDEX (`userid`)",
 
 		// Unregister filter
 		unregisterFilter(__FILE__, __LINE__, 'user_exclusion_sql', 'HOLIDAY_USER_EXCLUSION_SQL', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'pre_mail_recipient_check', 'CHECK_USER_HOLIDAY', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'pre_category_mail_order_check', 'PRE_USERID_HOLIDAY_CHECK', TRUE, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 5867318127..a044096960 100644
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.1.7');
+setThisExtensionVersion('0.1.8');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.51', '0.0.52', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.51', '0.0.52', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8'));
 
 switch (getExtensionMode()) {
 	case 'setup': // Do stuff when installation is running
@@ -52,7 +52,7 @@ switch (getExtensionMode()) {
 		addExtensionAddTableColumnSql('user_data', 'html', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
 		addExtensionAddTableColumnSql('bonus', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 		addExtensionAddTableColumnSql('pool', 'html_msg', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
-		addMemberMenuSql('main', 'html_mail', 'HTML-Empfang', 3);
+		addMemberMenuSql('account', 'html_mail', 'HTML-Empfang', 3);
 
 		// Register filter here
 		registerFilter(__FILE__, __LINE__, 'exclude_users', 'HTML_INCLUDE_USERS', FALSE, TRUE, isExtensionDryRun());
@@ -78,68 +78,6 @@ switch (getExtensionMode()) {
 		break;
 
 	case 'update': // Update an extension
-		switch (getCurrentExtensionVersion()) {
-			case '0.0.6': // SQL queries for v0.0.6
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Der erstellte HTML-Code wird noch kompiliert (eigene HTML-Codes umgewandelt).");
-				break;
-
-			case '0.0.8': // SQL queries for v0.0.8
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
-				break;
-
-			case '0.0.9': // SQL queries for v0.0.9
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.1.0': // SQL queries for v0.2.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Men&uuml;punkte im Gast-/Mitgliedsbereich k&ouml;nnen nicht mehr aufgerufen werden, wenn die Erweiterung deaktiviert ist.");
-				break;
-
-			case '0.1.1': // SQL queries for v0.1.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Seit <strong>Patch 340</strong> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
-				break;
-
-			case '0.1.2': // SQL queries for v0.1.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("W&ouml;rter <strong>{?mt_word?}</strong>, <strong>{?mt_word2?}</strong> und <strong>{?mt_word3?}</strong> sind austauschbar.");
-				break;
-
-			case '0.1.3': // SQL queries for v0.1.3
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate: SQL-Anweisungen gesch&uuml;tzt.");
-				break;
-
-			case '0.1.4': // SQL queries for v0.1.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
-				break;
-
-			case '0.1.5': // SQL queries for v0.1.5
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
-				break;
-
-			case '0.1.6':
-				// Dependency is needed for ext-registration!! (want to alter a non existent Table)
-				addExtensionDependency('bonus');
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abh&auml;nigkeit von der Erweiterung <strong>bonus</strong> hinzugef&uuml;gt.");
-				break;
-
-			case '0.1.7':
-				// Register filter
-				registerFilter(__FILE__, __LINE__, 'pre_mail_order', 'CHECK_HTML_MAIL_ORDER', FALSE, TRUE, isExtensionDryRun());
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Filter f&uuml;r ext-order hinzugef&uuml;gt.");
-				break;
-		} // END - switch
 		break;
 
 	case 'modify': // When the extension got modified
diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php
index c2694522ab..c4b2bc4111 100644
--- a/inc/extensions/ext-refback.php
+++ b/inc/extensions/ext-refback.php
@@ -50,6 +50,7 @@ switch (getExtensionMode()) {
 	case 'setup': // Do stuff when installation is running
 		// Member menu
 		addMemberMenuSql('main', 'refback', 'Refback einstellen', 4);
+		addMemberMenuSql('main', 'reflist', 'Ref-&Uuml;bersicht', 5);
 
 		// Execute this special file on registration
 		addIncludeToPool('extension', 'inc/fix_refsystem.php');
diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 44a7d844ab..2f533fdd0a 100644
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -53,7 +53,7 @@ switch (getExtensionMode()) {
 	case 'setup': // Do stuff when installation is running
 		// Check if mod_rewrite is loadeded
 		if (!isApacheModuleLoaded('mod_rewrite')) {
-			enableExtensionReportingFailure(TRUE);
+			enableExtensionReportingFailure();
 			addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 		} // END - if
 
@@ -70,7 +70,7 @@ switch (getExtensionMode()) {
 		// Check if mod_rewrite is loadeded
 		if (!isApacheModuleLoaded('mod_rewrite')) {
 			sqlQuery("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
-			enableExtensionReportingFailure(TRUE);
+			enableExtensionReportingFailure();
 			addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 	 } // END - if
 
@@ -148,7 +148,7 @@ switch (getExtensionMode()) {
 			case '0.1.3':
 				// Check if mod_rewrite is loadeded
 				if (!isApacheModuleLoaded('mod_rewrite')) {
-					enableExtensionReportingFailure(TRUE);
+					enableExtensionReportingFailure();
 					//addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
 				} // END - if
 				setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren gepr&uuml;ft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");
@@ -165,7 +165,7 @@ switch (getExtensionMode()) {
 	case 'init': // Do stuff when extension is initialized
 		// Check if mod_rewrite is loadeded
 		if (!isApacheModuleLoaded('mod_rewrite')) {
-			enableExtensionReportingFailure(TRUE);
+			enableExtensionReportingFailure();
 			sqlQuery("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
 			if (!isAdmin()) {
 				addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index fd19bd02d4..1dadbcd4a8 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.9.9');
+setThisExtensionVersion('1.0.0');
 
 // Version history array (add more with , '0.0.1' and so on)
-setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5', '0.9.6', '0.9.7', '0.9.8', '0.9.9'));
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5', '0.9.6', '0.9.7', '0.9.8', '0.9.9', '1.0.0'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 46a5e997e3..c520aface1 100644
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -59,13 +59,19 @@ switch (getExtensionMode()) {
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
+		// Is the required PHP extension 'recode' loaded?
+		if (!extension_loaded('recode')) {
+			// Required extension not loaded
+			enableExtensionReportingFailure();
+		} // END - if
+
 		// SQL commands to run
-		addExtensionSql('');
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='subids' LIMIT 1");
 		break;
 
 	case 'deactivate': // Do stuff when admin deactivates this extension
 		// SQL commands to run
-		addExtensionSql('');
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='subids' LIMIT 1");
 		break;
 
 	case 'update': // Update an extension
diff --git a/inc/extensions/holiday/mode-update.php b/inc/extensions/holiday/mode-update.php
index f1fa9c46a6..e183c27223 100644
--- a/inc/extensions/holiday/mode-update.php
+++ b/inc/extensions/holiday/mode-update.php
@@ -164,6 +164,12 @@ if (!defined('__SECURITY')) {
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Filter registriert f&uuml;r Mitglied-Ausschluss, die in Urlaub sind.");
 				break;
+
+			case '0.2.3': // SQL queries for v0.2.3
+				// Register filter
+				registerFilter(__FILE__, __LINE__, 'pre_mail_recipient_check', 'CHECK_USER_HOLIDAY', FALSE, TRUE, isExtensionDryRun());
+				registerFilter(__FILE__, __LINE__, 'pre_category_mail_order_check', 'PRE_USERID_HOLIDAY_CHECK', FALSE, TRUE, isExtensionDryRun());
+				break;
 		} // END - switch
 
 // [EOF]
diff --git a/inc/extensions/html_mail/.htaccess b/inc/extensions/html_mail/.htaccess
new file mode 100644
index 0000000000..3a42882788
--- /dev/null
+++ b/inc/extensions/html_mail/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/inc/extensions/html_mail/mode-update.php b/inc/extensions/html_mail/mode-update.php
new file mode 100644
index 0000000000..9acbfcc727
--- /dev/null
+++ b/inc/extensions/html_mail/mode-update.php
@@ -0,0 +1,115 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/01/2013 *
+ * ===================                          Last change: 06/01/2013 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : mode-update.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : HTML mails with default mail() routine           *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : HTML-Mails mit Standard mail()-Routine           *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+	die();
+} // END - if
+
+// @TODO Remove double tabs from all lines
+		switch (getCurrentExtensionVersion()) {
+			case '0.0.6': // SQL queries for v0.0.6
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Der erstellte HTML-Code wird noch kompiliert (eigene HTML-Codes umgewandelt).");
+				break;
+
+			case '0.0.8': // SQL queries for v0.0.8
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
+				break;
+
+			case '0.0.9': // SQL queries for v0.0.9
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
+				break;
+
+			case '0.1.0': // SQL queries for v0.2.1
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Men&uuml;punkte im Gast-/Mitgliedsbereich k&ouml;nnen nicht mehr aufgerufen werden, wenn die Erweiterung deaktiviert ist.");
+				break;
+
+			case '0.1.1': // SQL queries for v0.1.1
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Seit <strong>Patch 340</strong> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
+				break;
+
+			case '0.1.2': // SQL queries for v0.1.2
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("W&ouml;rter <strong>{?mt_word?}</strong>, <strong>{?mt_word2?}</strong> und <strong>{?mt_word3?}</strong> sind austauschbar.");
+				break;
+
+			case '0.1.3': // SQL queries for v0.1.3
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Sicherheitsupdate: SQL-Anweisungen gesch&uuml;tzt.");
+				break;
+
+			case '0.1.4': // SQL queries for v0.1.4
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
+				break;
+
+			case '0.1.5': // SQL queries for v0.1.5
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
+				break;
+
+			case '0.1.6': // SQL queries for v0.1.6
+				// Dependency is needed for ext-registration!! (want to alter a non existent Table)
+				addExtensionDependency('bonus');
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Abh&auml;nigkeit von der Erweiterung <strong>bonus</strong> hinzugef&uuml;gt.");
+				break;
+
+			case '0.1.7': // SQL queries for v0.1.7
+				// Register filter
+				registerFilter(__FILE__, __LINE__, 'pre_mail_order', 'CHECK_HTML_MAIL_ORDER', FALSE, TRUE, isExtensionDryRun());
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Filter f&uuml;r ext-order hinzugef&uuml;gt.");
+				break;
+
+			case '0.1.8': // SQL queries for v0.1.8
+				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account' WHERE `what`='html_mail' LIMIT 1");
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Auswahl im Mitglied verschoben nach &quot;Ihr Account&quot;.");
+				break;
+		} // END - switch
+
+// [EOF]
+?>
diff --git a/inc/extensions/sql_patches/mode-remove.php b/inc/extensions/sql_patches/mode-remove.php
index 3b8f503991..80f7716a8c 100644
--- a/inc/extensions/sql_patches/mode-remove.php
+++ b/inc/extensions/sql_patches/mode-remove.php
@@ -68,7 +68,6 @@ IN (
 // Delete/update member menu entries
 addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE
 `what`='stats2' OR
-`what`='reflist' OR
 (`action`='stats' AND (`what`='' OR `what` IS NULL)) OR
 (`action`='extras' AND (`what`='' OR `what` IS NULL)) OR
 (`action`='rals' AND (`what`='' OR `what` IS NULL)) OR
diff --git a/inc/extensions/sql_patches/mode-update.php b/inc/extensions/sql_patches/mode-update.php
index e1bd59226b..d99a5d547a 100644
--- a/inc/extensions/sql_patches/mode-update.php
+++ b/inc/extensions/sql_patches/mode-update.php
@@ -503,10 +503,8 @@ INDEX (`admin_id`)",
 				break;
 
 			case '0.5.4': // SQL queries for v0.5.4
-				addMemberMenuSql('main', 'reflist', 'Ref-&Uuml;bersicht', 5);
-
 				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Ref-&Uuml;bersicht eingebaut. Diese h&auml;ngt von der Erweiterung <strong>refback</strong> ab.");
+				setExtensionUpdateNotes("Dieses Update wurde nach ext-refback verschoben.");
 				break;
 
 			case '0.5.5': // SQL queries for v0.5.5
@@ -938,6 +936,13 @@ PRIMARY KEY (`server_name_id`)
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Jahres-Reset + generelles API-Modul hinzugef&uuml;gt.");
 				break;
+
+			case '1.0.0': // SQL queries for v1.0.0
+				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='account' WHERE `what`='categories'");
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Auswahl im Mitgliedsbereich verschoben nach &quot;Ihr Account&quot;.");
+				break;
 		} // END - switch
 
 // [EOF]
diff --git a/inc/extensions/user/mode-update.php b/inc/extensions/user/mode-update.php
index a44e5dc29d..b4dfc68f44 100644
--- a/inc/extensions/user/mode-update.php
+++ b/inc/extensions/user/mode-update.php
@@ -405,6 +405,12 @@ INDEX (`refid`)",
 				break;
 
 			case '0.5.3': // SQL queries for v0.5.3
+				// Is the PHP extension 'recode' activated
+				if (!extension_loaded('recode')) {
+					// This update requires 'recode'
+					enableExtensionReportingFailure();
+				} // END - if
+
 				// Register filter
 				registerFilter(__FILE__, __LINE__, 'post_refid_validation', 'HANDLE_USER_SUBID', FALSE, TRUE, isExtensionDryRun());
 				registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'SUBID_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
diff --git a/inc/filter/holiday_filter.php b/inc/filter/holiday_filter.php
index ce44eecebe..488ef9421d 100644
--- a/inc/filter/holiday_filter.php
+++ b/inc/filter/holiday_filter.php
@@ -58,5 +58,77 @@ function FILTER_HOLIDAY_USER_EXCLUSION_SQL ($sql) {
 	return $sql;
 }
 
+// Filter to check for user's holiday
+function FILTER_CHECK_USER_HOLIDAY ($filterData) {
+	// Is the id number set and valid?
+	if ((isset($filterData['userid'])) && (isValidId($filterData['userid']))) {
+		// Check for his holiday status
+		$result_holiday = sqlQueryEscaped("SELECT
+	`id`
+FROM
+	`{?_MYSQL_PREFIX?}_user_holidays`
+WHERE
+	`userid`=%s AND
+	`holiday_start` < UNIX_TIMESTAMP() AND
+	`holiday_end` > UNIX_TIMESTAMP()
+LIMIT 1",
+			array($filterData['userid']), __FILE__, __LINE__);
+
+		// Entry found?
+		if (sqlNumRows($result_holiday) == 1) {
+			// Exclude user who are in holiday
+			$filterData['userid'] = NULL;
+		} // END - if
+
+		// Free memory
+		sqlFreeResult($result_holiday);
+	} // END - if
+
+	// Return data for next filter
+	return $filterData;
+}
+
+// Filter to check if holiday is activated
+function FILTER_PRE_USERID_HOLIDAY_CHECK ($filterData) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+	// Is it still fine?
+	if ((isValidId($filterData['userid'])) && ($filterData['pre_okay'] === TRUE)) {
+		// Check user's holiday status
+		$result_holiday = sqlQueryEscaped("SELECT
+	COUNT(`d`.`userid`) AS `cnt`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_user_holidays` AS `h`
+ON
+	`d`.`userid`=`h`.`userid`
+WHERE
+	`d`.`userid`=%s AND
+	`d`.`receive_mails` > 0 AND
+	`d`.`status`='CONFIRMED' AND
+	`d`.`holiday_active`='Y' AND
+	`h`.`holiday_start` < UNIX_TIMESTAMP() AND
+	`h`.`holiday_end` > UNIX_TIMESTAMP()
+LIMIT 1",
+			array(
+				bigintval($filterData['userid'])
+			), __FILE__, __LINE__
+		);
+
+		// Fetch entry
+		list($count) = sqlFetchRow($result_holiday);
+
+		// Free memory
+		sqlFreeResult($result_holiday);
+
+		// Is holiday is active?
+		$filterData['pre_check'] = ($count == 0);
+	} // END - if
+
+	// Return filter data to next filter
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+	return $filterData;
+}
+
 // [EOF]
 ?>
diff --git a/inc/filter/theme_filter.php b/inc/filter/theme_filter.php
index dc662d26fb..3227a34291 100644
--- a/inc/filter/theme_filter.php
+++ b/inc/filter/theme_filter.php
@@ -53,10 +53,10 @@ function FILTER_HANDLE_THEME_CHANGE ($filterData) {
 		setMailerTheme($newTheme);
 
 		// Remove current from array
-		removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", getCurrentTheme()));
+		removeIncludeFromPool('theme', sprintf('theme/%s/theme.php', getCurrentTheme()));
 
 		// Add new theme
-		addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
+		addIncludeToPool('theme', sprintf('theme/%s/theme.php', $newTheme));
 
 		// Redirect to same URL
 		redirectToRequestUri();
diff --git a/inc/language/beg_de.php b/inc/language/beg_de.php
index 15a6219a3f..4249d4ae82 100644
--- a/inc/language/beg_de.php
+++ b/inc/language/beg_de.php
@@ -50,12 +50,12 @@ addMessages(array(
 	'BEG_LINK_BY' => "Bettel-Link bei <strong>{?MAIN_TITLE?}</strong>",
 	'BEG_LINK_USERID' => "Unser Mitglied <span class=\"data\">%s</span> hat gerade {?POINTS?} gebettelt.",
 	'BEG_USERID_STEAL_1' => "Das Mitglied ",
-	'BEG_USERID_STEAL_2' => " hat soeben <strong>{%%pipe,translateComma=%s%%} {?POINTS?}</strong> bei Ihnen erbettelt.",
-	'BEG_CLICKS' => "Dies war insgesamt der <strong>{%%pipe,translateComma=%s%%}.</strong> Klick auf sein Bettel-Link.",
+	'BEG_USERID_STEAL_2' => " hat soeben <strong>{%pipe,,translateComma=%01.5f%} {?POINTS?}</strong> bei Ihnen erbettelt.",
+	'BEG_CLICKS' => "Dies war insgesamt der <strong>{%pipe,,translateComma=%01.5f%}.</strong> Klick auf sein Bettel-Link.",
 	'BEG_THANKS_FOR_CLICK' => "Danke f&uuml;r Ihre Spende.",
 	'BEG_CONTINUE_REGISTER' => "Und weiter geht es zur Anmeldung bei {?MAIN_TITLE?} ...",
 	'BEG_SORRY_ANOTHER_WAS_HERE_1' => "Oh, schade! Es war vor kurzem schon einer hier! Das Mitglied ",
-	'BEG_SORRY_ANOTHER_WAS_HERE_2' => " hat von Ihnen auch keine <strong>{%%pipe,translateComma=%s%%} {?POINTS?}</strong> erhalten.",
+	'BEG_SORRY_ANOTHER_WAS_HERE_2' => " hat von Ihnen auch keine <strong>{%pipe,,translateComma=%01.5f%} {?POINTS?}</strong> erhalten.",
 	'BEG_THANKS_FOR_CLICK_AGAIN' => "Danke dennoch f&uuml;r den erneuten Klick.",
 	'BEG_POINTS_MIN_MAX' => "zwischen <strong>{%config,translateComma=beg_points%}</strong> und <strong>{%config,translateComma=beg_points_max%} {?POINTS?}</strong>",
 	'BEG_POINTS_FIXED' => "<strong>{%config,translateComma=beg_points%} {?POINTS?}</strong>",
@@ -71,7 +71,7 @@ addMessages(array(
 	'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
 	'ADMIN_CONFIG_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
 	'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieds-Id ",
-	'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine <strong>{%%pipe,translateComma=%s%%} {?POINTS?}</strong> erhalten.",
+	'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine <strong>{%pipe,,translateComma=%01.5f%} {?POINTS?}</strong> erhalten.",
 	'BEG_SAME_USERID_AS_OWN' => "Mitglieds-Id des Webmasters benutzt.",
 	'MEMBER_BEG_LINK_TITLE' => "Ihr Bettellink zum Bewerben",
 
diff --git a/inc/language/birthday_de.php b/inc/language/birthday_de.php
index f1c9b3e11d..a451c8c964 100644
--- a/inc/language/birthday_de.php
+++ b/inc/language/birthday_de.php
@@ -51,7 +51,7 @@ addMessages(array(
 
 	// Member messages
 	'MEMBER_HAPPY_BIRTHDAY_SUBJECT' => "Herzlichen Gl&uuml;ckwunsch zum Geburtstag.",
-	'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%%pipe,translateUserStatus=%s%%}</span>",
+	'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">{%pipe,,translateUserStatus=%s%}</span>",
 	'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.",
 
 	// Points account subject
diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 9596ca1e6c..a8a8dddb72 100644
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -101,7 +101,7 @@ addMessages(array(
 	'MEMBER_BONUS_STATS_TOTAL' => "100%-Klickratebonus",
 	'MEMBER_BONUS_RALLYE_DISABLED' => "Aktiv-Rallye derzeit nicht aktiv.",
 	'MEMBER_BONUS_STATS_SUBJECT' => "Ihr Aktiv-Bonus wegen 100% Klickrate",
-	'MEMBER_BONUS_LOGIN_BONUS_ADDED' => "Login-Bonus mit <strong>{%config,translateComma=login_bonus%} {?POINTS?}</strong> verg&uuml;tet.",
+	'MEMBER_BONUS_LOGIN_BONUS_ADDED' => "Erfolgtes Einloggen mit <strong>{%config,translateComma=login_bonus%} {?POINTS?}</strong> verg&uuml;tet.",
 	'MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED' => "Login-Bonus nicht verg&uuml;tet.",
 	'ADMIN_BONUS_MAIL_ALREADY_DELETED' => "Bonus-Mail bereits gel&ouml;scht.",
 	'ADMIN_CONFIG_BONUS_RALLYE_TITLE' => "Einstellungen an der Aktiv-Rallye",
diff --git a/inc/language/coupon_de.php b/inc/language/coupon_de.php
index c0c65eeb0d..d8e891a861 100644
--- a/inc/language/coupon_de.php
+++ b/inc/language/coupon_de.php
@@ -73,7 +73,7 @@ addMessages(array(
 	'MEMBER_ENTER_COUPON_CODE' => "Gutschein-Code eingeben:",
 	'MEMBER_COUPON_CODE_EMPTY' => "Sie haben keinen Gutschein-Code eingegeben. Bitte versuchen Sie es erneut.",
 	'MEMBER_COUPON_CODE_ALREADY_CASHED' => "Der von Ihnen eingegebene Gutschein-Code ist entweder ung&uuml;ltig, Ihnen nicht zugewiesen, bereits abgelaufen, oder Sie haben ihn bereits eingel&ouml;st.",
-	'MEMBER_COUPON_CODE_CASHED' => "Ihr Gutschein im Wert von <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> wurde soeben eingel&ouml;st und Ihrem Konto gutgeschrieben.",
+	'MEMBER_COUPON_CODE_CASHED' => "Ihr Gutschein im Wert von <span class=\"data\">{%pipe,,translateComma=%01.5f%} {?POINTS?}</span> wurde soeben eingel&ouml;st und Ihrem Konto gutgeschrieben.",
 	'MEMBER_COUPON_CASHED_404' => "Sie haben noch keinen Gutschein eingel&ouml;st oder es wurde noch keiner erstellt. Bitte pr&uuml;fen Sie Ihre Emails, ob Sie eventuell einen erhalten haben, den Sie noch einl&ouml;sen k&ouml;nnen.",
 	'MEMBER_LIST_CASHED_COUPONS_TITLE' => "Alle Ihre eingel&ouml;sten Gutscheine",
 	'MEMBER_LIST_CASHED_COUPONS_NOTICE' => "Bitte beachten Sie, dass Gutscheine nach <span class=\"data\">{%config,createFancyTime=coupon_autopurge_time%}</span> automatisch aus der Datenbank entfernt werden und Ihnen dann nicht mehr angezeigt werden. Das {?POINTS?}-Guthaben behalten Sie weiterhin.",
diff --git a/inc/language/de.php b/inc/language/de.php
index d5a08a343d..ef011ad19b 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -532,7 +532,7 @@ addMessages(array(
 	'MEMBER_PART_POINTS' => "Teilsummen",
 	'KBYTES' => "KBytes",
 	'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.",
-	'ADMIN_MEMBER_NO_CATEGORIES' => "Das Mitglied <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> hat keine Kategorien ausgew&auml;hlt.",
+	'ADMIN_MEMBER_NO_CATEGORIES' => "Das Mitglied <span class=\"data\">{%pipe,,generateUserProfileLink=%s%}</span> hat keine Kategorien ausgew&auml;hlt.",
 	'USER_ID' => "Mitglied",
 	'UNCONFIRMED_LINKS' => "Unbest&auml;tigte Mails",
 	'ADMIN_NO_UNCONFIRMED_MAILS_LEFT' => "Das Mitglied <span class=\"data\">%s</span> hat alle seine Mails best&auml;tigt.",
@@ -630,7 +630,7 @@ addMessages(array(
 	'ADMIN_EXTENSION_FILE_VERSION' => "Version (alt)",
 	'ADMIN_EXTENSION_TOTAL_FSIZE' => "Downloadgesamtgr&ouml;sse",
 	'ADMIN_EXTENSION_TOTAL_FOUND' => "Gesamt gefundene Erweiterungen",
-	'ADMIN_EXTENSION_VERSION' => "Version",
+	'ADMIN_EXTENSION_VERSION' => "Version:",
 	'ADMIN_EXTENSION_AUTOPURGE_404' => "autopurge nicht installiert.",
 	'ADMIN_EXTENSION_BONUS_OUTDATED' => "Ihre Bonus-Erweiterung ist veraltet! Version <span class=\"data\">%s</span> oder h&ouml;her wird ben&ouml;tigt.",
 	'ADMIN_EXTENSION_BONUS_404' => "bonus nicht installiert.",
@@ -639,7 +639,7 @@ addMessages(array(
 	'ADMIN_EXTENSION_EDITED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen editiert.",
 	'ADMIN_EXTENSION_REGISTER_NEXT_LINK' => "Weiter zur Task-&Uuml;bersicht...",
 	'ADMIN_REGISTERED_EXTENSIONS' => "Registrierte Erweiterungen",
-	'ADMIN_EXTENSION_NAME' => "Erweiterungsname",
+	'ADMIN_EXTENSION_NAME' => "Erweiterungsname:",
 	'ADMIN_EXTENSION_ACTIVE' => "Aktiviert?",
 	'ADMIN_DE_ACTIVATE' => "De-/Aktivieren",
 	'ADMIN_SEARCH_NEW_EXTENSIONS' => "Nach neuen Erweiterungen suchen...",
@@ -840,7 +840,7 @@ addMessages(array(
 	'ADMIN_ENTER_REFERRAL_BANNER_URL' => "Banner-URL",
 	'ADMIN_ENTER_ALTERNATE_REFERRAL_BANNER_TEXT' => "Alternativen Text",
 	'ADMIN_SELECT_REFERRAL_BANNER_ACTIVE' => "Ist der Werbebanner aktiv?",
-	'ADMIN_LIST_REFERRALS' => "Referral-&Uuml;bersicht des Mitgliedes <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> in allen Ebenen:",
+	'ADMIN_LIST_REFERRALS' => "Referral-&Uuml;bersicht des Mitgliedes <span class=\"data\">{%pipe,,generateUserProfileLink=%s%}</span> in allen Ebenen:",
 	'ADMIN_LIST_REFERRALS_LEVEL' => "Referrals in Ebene <span class=\"data\">%s</span>:",
 	'ADMIN_LIST_REFERRALS_NOTICE' => "<strong>&Auml;nderung:</strong> Klicken Sie die Mitglieds-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referrals an, werden die Referrals des jeweiligen Mitgliedes aufgelistet.",
 	'MEMBER_YOUR_USERID' => "Ihre Mitglieds-Id bei uns:",
@@ -890,13 +890,13 @@ addMessages(array(
 	'REASON_DIRECT_PAYMENT' => "Direkte Gutschrift (siehe evtl. vorangegangene Mail)",
 	'ADMIN_LOGOUT_SQL_PATCHES_DONE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> installiert haben und dabei das Passort-Hashing ge&auml;ndert/verbessert wurde. Bitte erneut einloggen.",
 	'ADMIN_LOGOUT_SQL_PATCHES_REMOVE' => "Sie wurden automatisch ausgeloggt, da Sie die Erweiterung <strong>sql_patches</strong> entfernt haben. Bitte klicken Sie weiter, um jetzt das Passwort neu zu setzen.",
-	'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> zur&uuml;ckgeschrieben.",
-	'ADMIN_POINTS_TO_JACKPOT' => "Es wurden <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> in den Jackpot gelegt.",
+	'ADMIN_POINTS_REPAYED' => "Es wurden dem Mitglied <span class=\"data\">{%pipe,,translateComma=%01.5f%} {?POINTS?}</span> zur&uuml;ckgeschrieben.",
+	'ADMIN_POINTS_TO_JACKPOT' => "Es wurden <span class=\"data\">{%pipe,,translateComma=%01.5f%} {?POINTS?}</span> in den Jackpot gelegt.",
 	'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zur&uuml;ckbuchen.",
-	'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span> geschrettert.",
-	'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
-	'ADMIN_EXTENSION_PROBLEM_EXTENSION_OUTDATED' => "Die Erweiterung <span class=\"data\">%s</span> ist veraltet. Ihre Version: <span class=\"data\">{%%ext,version=%s%%}</span>, erwartete Version: <span class=\"data\">%s</span>.",
-	'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%%url=modules.php?module=admin&amp;what=extensions%%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+	'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">{%pipe,,translateComma=%01.5f%} {?POINTS?}</span> geschrettert.",
+	'ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%url=modules.php?module=admin&amp;what=extensions%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+	'ADMIN_EXTENSION_PROBLEM_EXTENSION_OUTDATED' => "Die Erweiterung <span class=\"data\">%s</span> ist veraltet. Ihre Version: <span class=\"data\">{%ext,version=%s%}</span>, erwartete Version: <span class=\"data\">%s</span>.",
+	'ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%url=modules.php?module=admin&amp;what=extensions%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
 	'ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED' => "Erweiterung <span class=\"data\">%s</span> nicht installiert..",
 	'EXTENSION_PROBLEM_EXTENSION_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert.",
 	'EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert.",
@@ -988,7 +988,7 @@ addMessages(array(
 	'ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK' => "Entwickler-Version",
 	'ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE' => "Die Erweiterung &#39;%s&#39; sollten Sie nur installieren, wenn Sie daran mitentwickeln wollen. Produktiv ist diese nicht einsatzbereit.",
 	'ADMIN_ENTRIES_404' => "Es wurden keine Eintr&auml;ge gefunden.",
-	'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung <span class=\"data\">{%%pipe,getExtensionName=%s%%}</span> kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.",
+	'ADMIN_EXTENSION_ALWAYS_ACTIVE' => "Die Erweiterung <span class=\"data\">{%pipe,,getExtensionName=%s%}</span> kann nicht deaktiviert werden, da sie immer aktiv bleiben muss.",
 	'MEMBER_REFERRAL_LINKS_FOOTER' => "Ihr Referral-Link eingebaut in Ihrer Homepage bringt Ihnen passiv mehr Referrals. (Aber Ihren Referral-Link bewerben schadet auch nicht... ;-) )",
 	'POINTS_OWN' => "Eigenguthaben:",
 	'POINTS_ORDER' => "Werbeguthaben:",
@@ -1002,7 +1002,7 @@ addMessages(array(
 	'MEMBER_RANDOM_REFID_CONFIRMED' => "Anzahl Mails best&auml;tigt, damit Ihr Account per Zufall ausgew&auml;hlt wird",
 	'MEMBER_YOUR_REFID_IS' => "Sie wurden geworben von",
 	'ADMIN_CONFIG_ADMIN_MENU_NOTICE' => "Das Men&uuml;system mit &quot;logischen Bereichen&quot; ist noch nicht fertig und f&uuml;hrt zu Fehlern. Bitte dieses nur im Template aktivieren, wenn Sie daran mitprogrammieren wollen.",
-	'UNKNOWN_ERROR_CODE' => "Unbekannter Fehlercode <span class=\"data\">0x{%%pipe,getHexErrorCode=%s%%}</span> erkannt.",
+	'UNKNOWN_ERROR_CODE' => "Unbekannter Fehlercode <span class=\"data\">0x{%pipe,,getHexErrorCode=%s%}</span> erkannt.",
 	'LOADER_SECURITY_HASH_MISMATCH' => "Der Sicherheitshash f&uuml;r den Dereferrer stimmt nicht mit der URL &uuml;berein.",
 	'URL_IS_BLACKLISTED' => "URL ist gesperrt.",
 	'EMAIL_IS_BLACKLISTED' => "Ihre Email-Adresse darf bei uns nicht verwendet werden. Bitte setzen Sie sich mit uns in Verbindung.",
@@ -1167,7 +1167,7 @@ addMessages(array(
 	'MEMBER_REFLIST_LIST_TITLE_1' => "Ihre Referrals in Ebene <u>",
 	'MEMBER_REFLIST_LIST_TITLE_2' => "</u> (<u>",
 	'MEMBER_REFLIST_LIST_TITLE_3' => "&#37;</u>)",
-	'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie <span class=\"data\">{%%pipe,translateComma=%s%%}</span> Mitglieder geworben.",
+	'MEMBER_REFLIST_COUNTER' => "In dieser Ebene haben Sie <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> Mitglieder geworben.",
 	'MEMBER_REFLIST_TITLE' => "Referral-&Uuml;bersicht",
 	'MEMBER_REFLIST_POINTS' => "Verdienst des Mitgliedes",
 	'MEMBER_REFLIST_ACTIVITY' => "Mitglied aktiv?",
diff --git a/inc/language/earning_de.php b/inc/language/earning_de.php
index 511f33a99f..391d2fd89f 100644
--- a/inc/language/earning_de.php
+++ b/inc/language/earning_de.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addMessages(array(
 	// Member strings
 	'MEMBER_EARNINGS_404' => "Es wurden noch keine Zusatzverdienste durch die Administratoren eingerichtet. Bitte kommen Sie sp&auml;ter hier erneut vorbei.",
-	'MEMBER_EARNING_POPUP_FORM_TITLE' => "Zusatzverdienst durch PopUps - Kategorie: {%%pipe,translateEarningProvider=%s%%}",
+	'MEMBER_EARNING_POPUP_FORM_TITLE' => "Zusatzverdienst durch PopUps - Kategorie: {%pipe,,translateEarningProvider=%s%}",
 	'MEMBER_EARNING_ENTER_DAILY_POPUP_AMOUNT' => "Wie viele PopUps wollen Sie im Login t&auml;glich maximal sehen?",
 	'MEMBER_EARNING_SUBSCRIBE_SUBMIT' => "Zusatzverdienst aktivieren",
 	'MEMBER_EARNING_DATA_MIN_POINTS' => "Mindestens verdienbar:",
diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php
index 924a4d61bf..19bb9826c9 100644
--- a/inc/language/mailid_de.php
+++ b/inc/language/mailid_de.php
@@ -44,15 +44,15 @@ if (!defined('__SECURITY')) {
 addMessages(array(
 	'MAIL_DATA_INVALID' => "Daten der Mailbuchung sind fehlerhaft.",
 	'ERROR_CONFIRMING_MAIL' => "Bitte klicken Sie nur Links aus Ihrem Mitgliedsbereich oder aus den Mails an.",
-	'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
-	'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
-	'MEMBER_POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
-	'MEMBER_POINTS_NOT_ADDED2' =>"Falscher Best&auml;tigungscode eingegeben! Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} wurden Ihnen nicht gutgeschrieben.",
+	'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
+	'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
+	'MEMBER_POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
+	'MEMBER_POINTS_NOT_ADDED2' =>"Falscher Best&auml;tigungscode eingegeben! Die <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> {?POINTS?} wurden Ihnen nicht gutgeschrieben.",
 	'MEMBER_ENTER_CODE' => "Code eingeben",
 	'MEMBER_TIME_COUNTER_1' => "Gutschrift der {?POINTS?} erfolgt in ",
 	'MEMBER_TIME_COUNTER_2' => " Sekunden ...",
 	'MEMBER_SUBMIT_CODE' => "Abschicken",
-	'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span>.",
+	'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"data\">{%pipe,,translateComma=%01.5f%} {?POINTS?}</span>.",
 	'MEMBER_MAILID_CLICK_BUTTON' => "Einmal den Button anklicken",
 
 	// Points accounts - subject
diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index e5a4508df4..9983cfc789 100644
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -91,10 +91,10 @@ addMessages(array(
 	'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-&Uuml;bersetzungen auflisten und verwalten",
 	'ADMIN_EDIT_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-&Uuml;bersetzungen editeren",
 	'ADMIN_DELETE_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-&Uuml;bersetzungen l&ouml;schen",
-	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler einrichten - <span class=\"data\">{%%pipe,translateNetworkTypeHandler=%s%%}</span>",
-	'ADMIN_SHOW_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Eingerichteter Werbeart-Handler - <span class=\"data\">{%%pipe,translateNetworkTypeHandler=%s%%}</span>",
+	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler einrichten - <span class=\"data\">{%pipe,,translateNetworkTypeHandler=%s%}</span>",
+	'ADMIN_SHOW_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Eingerichteter Werbeart-Handler - <span class=\"data\">{%pipe,,translateNetworkTypeHandler=%s%}</span>",
 	'ADMIN_CONFIG_NETWORK_HANDLER_TYPES_TITLE' => "Werbeart-Handler einrichten",
-	'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler &auml;ndern - <span class=\"data\">{%%pipe,translateNetworkTypeHandler=%s%%}</span>",
+	'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler &auml;ndern - <span class=\"data\">{%pipe,,translateNetworkTypeHandler=%s%}</span>",
 	// - Link titles
 	'ADMIN_NETWORK_API_CONFIG_LINK_TITLE' => "Weiter zur API-Konfiguration",
 	'ADMIN_NETWORK_TYPE_HANDLER_CONFIG_LINK_TITLE' => "Weiter zur Werbart-Handler-Konfiguration",
@@ -119,7 +119,7 @@ addMessages(array(
 	'ADMIN_REMOVE_NETWORK_ARRAY_TRANSLATION_SUBMIT' => "Array-Element-&Uuml;bersetzung(en) entfernen",
 	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT' => "Jetzt den Werbeart-Handler einrichten",
 	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT' => "Werbeart-Handlerdaten hinzuf&uuml;gen",
-	'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT' => "Konfiguration f&uuml;r {%%pipe,translateNetworkTypeHandler=%s%%} &auml;ndern",
+	'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT' => "Konfiguration f&uuml;r {%pipe,,translateNetworkTypeHandler=%s%} &auml;ndern",
 	'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT' => "Werbeart-Handler &auml;ndern",
 	// - Success titles
 	'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt",
@@ -278,7 +278,7 @@ addMessages(array(
 	'ADMIN_CONFIG_NETWORK_API_ENTER_REFERRAL_BUTTON' => "Optionaler 88x31 Werbebutton:",
 	'ADMIN_CONFIG_NETWORK_API_REMAINING_REQUESTS' => "Noch verbleibene API-Abfragen:",
 	'ADMIN_CONFIG_NETWORK_API_VISUAL_PAY_CHECK' => "Wert f&uuml;r Visual-Pay-Check (<strong>&amp;vc=x</strong>):",
-	'ADMIN_CONFIG_NETWORK_API_TITLE' => "API-Zugangsdaten zum Werbenetzwerk <span class=\"data\">{%%network,generateMetworkReferralLinkById=%s%%}</span>:",
+	'ADMIN_CONFIG_NETWORK_API_TITLE' => "API-Zugangsdaten zum Werbenetzwerk <span class=\"data\">{%network,generateMetworkReferralLinkById=%s%}</span>:",
 	'ADMIN_CONFIG_NETWORK_API_SAVE_BUTTON' => "API-Konfiguration speichern",
 	'ADMIN_CONFIG_NETWORK_API_SAVED' => "API-Konfiguration gespeichert.",
 	'ADMIN_CONFIG_NETWORK_API_NOT_SAVED' => "API-Konfiguration NICHT gespeichert (keine &Auml;nderungen).",
@@ -289,7 +289,7 @@ addMessages(array(
 	'ADMIN_CONFIG_NETWORK_HANDLER_TYPES_404' => "Es wurden keine Daten zur Werbenetzwerk-Id <span class=\"data\">%s</span> gefunden. Bitte benachrichtigen Sie das Entwickler-Team.",
 	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_404' => "Dieser Werbeart-Handler wurde noch nicht eingerichtet. {--ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_404_NOTICE--} Bitte richten Sie diesen als n&auml;chstes ein und f&uuml;hren Sie danach eine Testabfrage aus.",
 	'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_404_NOTICE' => "Damit das Script auch das Interface des Werbenetzwerks ansprechen kann, muss ein Werbeart-Handler eingerichtet werden.",
-	'ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME' => "Reloadsperre (<span class=\"data\">{%%pipe,translateTimeUnit=%s%%}</span>):",
+	'ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME' => "Reloadsperre (<span class=\"data\">{%pipe,,translateTimeUnit=%s%}</span>):",
 	'ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME_UNMASKED' => "Reloadsperre:",
 	'ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME' => "Mindestauffenthalt:",
 	'ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_WAITING_TIME' => "Maximaler Auffenthalt:",
@@ -322,7 +322,7 @@ addMessages(array(
 	'ADMIN_ACTION_QUERY_NETWORK_SUBMIT' => "Alle APIs des Werbenetzwerks abfragen",
 	'ADMIN_ACTION_QUERY_NETWORK_TYPE_SUBMIT' => "Werbart-Handler abfragen",
 	// Querying APIs - others
-	'ADMIN_QUERY_NETWORK_APIS_TITLE' => "APIs vom Werbenetzwerk <span class=\"data\">{%%network,generateMetworkReferralLinkById=%s%%}</span> abfragen",
+	'ADMIN_QUERY_NETWORK_APIS_TITLE' => "APIs vom Werbenetzwerk <span class=\"data\">{%network,generateMetworkReferralLinkById=%s%}</span> abfragen",
 	'ADMIN_QUERY_NETWORK_TYPE' => "Einzelnen Werbeart-Handler abfragen",
 	'ADMIN_ACTION_QUERY_ALL_NETWORK_APIS_SUBMIT' => "Alle ausgew&auml;hlten Werbeart-Handler abfragen",
 	'ADMIN_NETWORK_QUERY_TYPE_OKAY' => "Das Werbenetzwerk <span class=\"data\">%s</span> wurde soeben abgefragt. Die Daten wurden zwischengespeichert f&uuml;r sp&auml;tere Verwendung und um die API-Anfragen zu reduzieren.",
diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php
index 31245dd409..f6ddd5f611 100644
--- a/inc/language/payout_de.php
+++ b/inc/language/payout_de.php
@@ -119,8 +119,9 @@ addMessages(array(
 	'MEMBER_PAYOUT_OPTIONAL_PASSWORD' => "Optionales Passwort",
 	'MEMBER_PAYOUT_STATUS' => "Status",
 	'MEMBER_PAYOUT_REMEMBER_TERMS' => "Bitte beachten Sie f&uuml;r Auszahlungen in e-W&auml;hrungen unsere AGBs.",
-	'MEMBER_PAYOUT_SETUP_INCOMPLETE' => "Es wurden vom Admin noch keine Auszahlungstypen eingerichtet.",
+	'MEMBER_PAYOUT_SETUP_INCOMPLETE_LOW_POINTS' => "Es wurden vom Admin noch keine Auszahlungstypen eingerichtet oder Ihre auszahlungsf&auml;higes Guthaben reicht f&uuml;r eine Auszahlung nicht aus.",
 	'MEMBER_PAYOUT_NO_POINTS_ENTERED' => "Sie haben keine {?POINTS?} zum Auszahlen eingegeben, oder es besteht ein &Uuml;bertragungsfehler! Bitte benachrichtigen Sie den Support.",
+	'MEMBER_TOTAL_PAYOUT_POINTS' => "Auszahlungsf&auml;higes Guthaben: <strong>{%pipe,translateComma=%01.5f%} {?POINTS?}</strong>",
 
 	// Member+Admin messages
 	'PAYOUT_TOTAL_PAYOUT' => "Gesamtbetrag",
diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index d3dec1ebb1..fb8209b434 100644
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -85,7 +85,7 @@ addMessages(array(
 	'ADMIN_RALLYE_START_NOTIFY_NOW' => "Mitglieder autom. benachrichtigen",
 	'ADMIN_RALLYE_EDIT_ONLY_INACTIVE_NOTICE' => "Es k&ouml;nnen nur deaktivierte Referral-Rallyes bearbeitet bzw. gel&ouml;scht werden. Beim L&ouml;schen werden alle dazu verkn&uuml;pften Daten ebenfalls ohne Vorwarnung gel&ouml;scht.",
 	'ADMIN_RALLYE_DELETE_NOTHING_SELECTED' => "Keine Referral-Rallye(s) zum L&ouml;schen ausgew&auml;hlt.",
-	'ADMIN_RALLYE_NO_PRICES_SELECTED' => "Sie haben keine Rallye-Preise ausgew&auml;hlt! <a href=\"{%%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=%s%%}\">Zur&uuml;ck zu den Preisen</a>",
+	'ADMIN_RALLYE_NO_PRICES_SELECTED' => "Sie haben keine Rallye-Preise ausgew&auml;hlt! <a href=\"{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=%s%}\">Zur&uuml;ck zu den Preisen</a>",
 	'ADMIN_RALLYE_DELETED' => "Rallye(s) wurde(n) gel&ouml;scht.",
 	'RALLYE_MEMBER_NO_PRICES' => "--> Keine Preise  f&uuml;r Modus <span class=\"data\">%s</span> ausgesetzt! <--",
 	'RALLYE_MEMBER_PRICES_ADDED' => "Die Preise",
diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php
index 836a01115d..56aee5dc93 100644
--- a/inc/language/sponsor_de.php
+++ b/inc/language/sponsor_de.php
@@ -248,7 +248,7 @@ addMessages(array(
 	'SPONSOR_EMAIL_404' => "Bei der Anmeldung ist uns ein Fehler unterlaufen: Ihr Sponsor-Account mit der EMail-Adresse <span class=\"data\">%s</span> wurde nicht gefunden.",
 	'SPONSOR_ACCOUNT_PENDING_FAILED' => "Bei der Umschaltung Ihres Sponorenaccounts auf <span class=\"bad\">Wartend</span> trat ein unerwarteter Fehler auf.",
 	'SPONSOR_ACCOUNT_404' => "Das von Ihnen angegebene Sponsorenaccount <span class=\"data\">%s</span> konnte nicht gefunden werden.",
-	'SPONSOR_ACCOUNT_FAILED' => "Sponsorenaccount konnte nicht geladen werden: <span class=\"data\">{%%pipe,translateSponsorStatus=%s%%}</span>",
+	'SPONSOR_ACCOUNT_FAILED' => "Sponsorenaccount konnte nicht geladen werden: <span class=\"data\">{%pipe,,translateSponsorStatus=%s%}</span>",
 	'SPONSOR_ACCOUNT_EMAIL_FAILED' => "Konnten Sponsorenaccount nicht freigeben! Bitte benachrichtigen Sie den Support.",
 
 	// Login form
diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php
index b070a56da3..980796ca6a 100644
--- a/inc/language/wernis_de.php
+++ b/inc/language/wernis_de.php
@@ -103,7 +103,7 @@ addMessages(array(
 	'MEMBER_WERNIS_MODE_CHOOSE2' => "Hier klicken um neue &Uuml;berweisung zu starten...",
 	'MEMBER_WERNIS_NO_ACCOUNT' => "Noch kein WDS66-Account? Hier entlang.",
 	'MEMBER_WERNIS_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten m&uuml;ssen.",
-	'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht gen&uuml;gend Wernis zum Auszahlen! Mindestens: <span class=\"data\">{%%config,translateComma=wernis_min_payout%%} {?POINTS?}</span>, Ihr Guthaben: <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?}.",
+	'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht gen&uuml;gend Wernis zum Auszahlen! Mindestens: <span class=\"data\">{%config,translateComma=wernis_min_payout%} {?POINTS?}</span>, Ihr Guthaben: <span class=\"data\">{%pipe,,translateComma=%01.5f%}</span> {?POINTS?}.",
 	'MEMBER_WERNIS_WITHDRAW_TITLE' => "Wernis bei {?MAIN_TITLE?} einzahlen:",
 	'MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT' => "Wernis hier im Account:",
 	'MEMBER_WERNIS_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Wernis-Guthaben:",
diff --git a/inc/language/yoomedia_de.php b/inc/language/yoomedia_de.php
index 6a57147426..13d9c65180 100644
--- a/inc/language/yoomedia_de.php
+++ b/inc/language/yoomedia_de.php
@@ -64,7 +64,7 @@ addMessages(array(
 	'ADMIN_YOOMEDIA_REMOVE_MAIL' => "Mail entfernen",
 	'ADMIN_YOOMEDIA_UNLIST_MAIL' => "Aus Ausschlussliste nehmen",
 	'ADMIN_YOOMEDIA_TEXTMAIL_ALREADY_SENT' => "Textmail wurde <span class=\"data\">%s</span> bereits versendet.",
-	'ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN' => "Textmail kann in <span class=\"data\">{%%pipe,createFancyTime=%s%%}</span> erneut versendet werden.",
+	'ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN' => "Textmail kann in <span class=\"data\">{%pipe,,createFancyTime=%s%}</span> erneut versendet werden.",
 	'ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED' => "Textmail wurde manuell gesperrt.",
 	'ADMIN_LIST_YOOMEDIA_TITLE' => "Alle Textmails von der Yoo!Media API 2.0 anzeigen",
 	'ADMIN_LIST_YOOMEDIA_NOTICE' => "<strong>Hinweise:</strong> Mails mit 0 Sekunden Mindestaufenthalt sind meistens Framekiller-Mails. Sie k&ouml;nnen eine Mail nur erneut aussenden, wenn die Reload-Sperre abgelaufen ist.",
diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index e8b2e853b5..c8a9f304de 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -57,6 +57,8 @@ WHERE
 ORDER BY
 	`type` ASC',
 			array($points), __FUNCTION__, __LINE__);
+
+		// Some entries found?
 		if (!ifSqlHasZeroNums($result)) {
 			// Init output
 			$OUT = '';
@@ -77,7 +79,7 @@ ORDER BY
 			loadTemplate('member_payout_list', TRUE, $OUT);
 		} else {
 			// No payout types setup so far
-			displayErrorMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+			displayErrorMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE_LOW_POINTS--}');
 		}
 
 		// Free memory
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 6f3bc4fc4d..935236ece7 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -152,32 +152,15 @@ ORDER BY
 		// Are there still receivers left?
 		if (sqlNumRows($result) >= postRequestElement('receiver')) {
 			// Load receivers from database
-			$TEST = array(); $count = '0';
+			$receiverArray = array(); $count = '0';
 			while ($holidayContent = sqlFetchArray($result)) {
-				if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-					// Check for his holiday status
-					$result_holiday = sqlQueryEscaped("SELECT
-	`id`
-FROM
-	`{?_MYSQL_PREFIX?}_user_holidays`
-WHERE
-	`userid`=%s AND
-	`holiday_start` < UNIX_TIMESTAMP() AND
-	`holiday_end` > UNIX_TIMESTAMP()
-LIMIT 1",
-						array($holidayContent['userid']), __FILE__, __LINE__);
-					if (sqlNumRows($result_holiday) == 1) {
-						// Exclude user who are in holiday
-						$holidayContent['userid'] = '0';
-					} // END - if
-
-					// Free memory
-					sqlFreeResult($result_holiday);
-				} // END - if
+				// Run fetched data through pre filter chain
+				$holidayContent = runFilterChain('pre_mail_recipient_check', $holidayContent);
 
+				// Is still valid id?
 				if (isValidId($holidayContent['userid'])) {
-					// Add receiver
-					array_push($TEST, $holidayContent['userid']);
+					// Add receiver then
+					array_push($receiverArray, $holidayContent['userid']);
 					$count++;
 				} // END - if
 			} // END - while
@@ -186,10 +169,10 @@ LIMIT 1",
 			sqlFreeResult($result);
 
 			// Implode array into string for the sending pool
-			$receivers = implode($TEST, ';');
+			$receivers = implode($receiverArray, ';');
 
 			// Count array for maximum sent
-			$content['target_send'] = count($TEST);
+			$content['target_send'] = count($receiverArray);
 
 			// Update receiver list
 			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
@@ -331,43 +314,22 @@ ORDER BY
 
 				$userid_cnt = '0';
 				while (list($userid) = sqlFetchRow($result_userids)) {
-					// Check for holiday system
-					$isHolidayActive = FALSE;
-					if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-						// Check user's holiday status
-						$result_holiday = sqlQueryEscaped("SELECT
-	COUNT(`d`.`userid`) AS `cnt`
-FROM
-	`{?_MYSQL_PREFIX?}_user_data` AS `d`
-LEFT JOIN
-	`{?_MYSQL_PREFIX?}_user_holidays` AS `h`
-ON
-	`d`.`userid`=`h`.`userid`
-WHERE
-	`d`.`userid`=%s AND
-	`d`.`receive_mails` > 0 AND
-	`d`.`status`='CONFIRMED' AND
-	`d`.`holiday_active`='Y' AND
-	`h`.`holiday_start` < UNIX_TIMESTAMP() AND
-	`h`.`holiday_end` > UNIX_TIMESTAMP()
-LIMIT 1",
-							array(bigintval($userid)), __FILE__, __LINE__);
-
-						// Fetch entry
-						list($count) = sqlFetchRow($result_holiday);
-
-						// Free memory
-						sqlFreeResult($result_holiday);
+					// Init filter data array
+					$filterData = array(
+						'userid'   => $userid,
+						'pre_okay' => TRUE,
+					);
 
-						// Is holiday is active?
-						$isHolidayActive = ($count == 1);
-					} // END - if
+					// Check for holiday system
+					$filterData = runFilterChain('pre_category_mail_order_check', $filterData);
 
-					if ($isHolidayActive === FALSE) {
+					// Still all fine?
+					if ($filterData['pre_okay']) === TRUE) {
 						// Check if the user want's to receive mails?
 						$result_ver = sqlQueryEscaped("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s" . $HTML . " AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
 							array(bigintval($userid)), __FILE__, __LINE__);
 
+						// Is an entry found?
 						if ((sqlNumRows($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
 							// Get zip code
 							list($zip) = sqlFetchRow($result_ver);
diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index c0f6f66d53..91c79fd01f 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -55,9 +55,13 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
 // Translate point into comma
 $payoutPoints = getPayoutPoints(getMemberId());
 
+// Output amount
+displayMessage('{%message,MEMBER_TOTAL_PAYOUT_POINTS=' . $payoutPoints . '%}');
+
+// GET parameter set?
 if (!isGetRequestElementSet('payout')) {
 	// Load payout types
-	$result = sqlQueryEscaped("SELECT
+	$result = sqlQueryEscaped('SELECT
 	`id`,
 	`type`,
 	`rate`,
@@ -68,12 +72,11 @@ FROM
 WHERE
 	%s >= `min_points`
 ORDER BY
-	`type` ASC",
+	`type` ASC',
 		array($payoutPoints), __FILE__, __LINE__);
-	if (!ifSqlHasZeroNums($result)) {
-		// Free memory
-		sqlFreeResult($result);
 
+	// Some entries found?
+	if (!ifSqlHasZeroNums($result)) {
 		// Check for his payouts
 		$result_payouts = sqlQueryEscaped('SELECT
 	`p`.`id`,
@@ -133,11 +136,23 @@ ORDER BY
 		outputPayoutList($payoutPoints);
 	} else {
 		// No payout types setup
-		displayMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+		displayMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE_LOW_POINTS--}');
 	}
+
+	// Free memory
+	sqlFreeResult($result);
 } else {
 	// Chedk if he can get paid by selected type
-	$result = sqlQueryEscaped("SELECT `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+	$result = sqlQueryEscaped('SELECT
+	`type`,
+	`rate`,
+	`min_points`,
+	`allow_url`
+FROM
+	`{?_MYSQL_PREFIX?}_payout_types`
+WHERE
+	`id`=%s
+LIMIT 1',
 		array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
 
 	if (sqlNumRows($result) == 1) {
@@ -153,7 +168,7 @@ ORDER BY
 		if (isPostRequestElementSet('payout')) {
 			$points  = bigintval(postRequestElement('payout')) / $content['rate'];
 			$PAY_MAX = $max / $content['rate'];
-		}
+		} // END - if
 
 		// Has enougth points to payout?
 		if ($payoutPoints >= $content['min_points']) {
diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 15f52653be..fb44a800f3 100644
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -56,11 +56,11 @@ if ((!isFormSent()) || (!isPostRequestElementSet('qsummary'))) {
 } else {
 	// Load mail template based on your member's decision
 	if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
-		$a_tpl = 'admin_support-' . postRequestElement('qsummary');
+		$a_tpl = 'admin_support_' . postRequestElement('qsummary');
 	} else {
-		$message_a = loadEmailTemplate('admin_support-' . postRequestElement('qsummary'), array('text' => postRequestElement('qdetails')), getMemberId());
+		$message_a = loadEmailTemplate('admin_support_' . postRequestElement('qsummary'), array('text' => postRequestElement('qdetails')), getMemberId());
 	}
-	$message_m = loadEmailTemplate('member_support-' . postRequestElement('qsummary'), array('text' => postRequestElement('qdetails')), getMemberId());
+	$message_m = loadEmailTemplate('member_support_' . postRequestElement('qsummary'), array('text' => postRequestElement('qdetails')), getMemberId());
 
 	// Select right subject
 	switch (postRequestElement('qsummary')) {
diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index 0228d8f528..87f2d4e1b6 100644
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -134,7 +134,7 @@ function addXmlSpecialElements ($template) {
 // Parses the XML content
 function parseXmlData ($content) {
 	// Is there recode?
-	if (!function_exists('recode')) {
+	if (!extension_loaded('recode')) {
 		// No fallback ATM
 		reportBug(__FUNCTION__, __LINE__, 'PHP extension recode is missing. Please install it.');
 	} // END - if
diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl
index 415ef03a29..84d1ed3b8c 100644
--- a/templates/de/emails/admin/admin_support-ordr.tpl
+++ b/templates/de/emails/admin/admin_support-ordr.tpl
@@ -1,26 +1 @@
-Hallo Administrator,
-
-Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zum Mailversand.
-
-------------------------------
-{--MEMBER_USERID--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
-------------------------------
-Browser: {%server,user_agent%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Script
-
-{?URL?}/admin.php
+@DEPRECATED
diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl
index 1ba684a75e..84d1ed3b8c 100644
--- a/templates/de/emails/admin/admin_support-reflink.tpl
+++ b/templates/de/emails/admin/admin_support-reflink.tpl
@@ -1,26 +1 @@
-Hallo Administrator,
-
-Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinem Referral-Link.
-
-------------------------------
-{--MEMBER_USERID--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
-------------------------------
-Browser: {%server,user_agent%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Script
-
-{?URL?}/admin.php
+@DEPRECATED
diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl
index 15e4bf1903..84d1ed3b8c 100644
--- a/templates/de/emails/admin/admin_support-unconfirmed.tpl
+++ b/templates/de/emails/admin/admin_support-unconfirmed.tpl
@@ -1,26 +1 @@
-Hallo Administrator,
-
-Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinen unbest&auml;tigten Mails.
-
-------------------------------
-{--MEMBER_USERID--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
-------------------------------
-Browser: {%server,user_agent%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Script
-
-{?URL?}/admin.php
+@DEPRECATED
diff --git a/templates/de/emails/admin/admin_support_ordr.tpl b/templates/de/emails/admin/admin_support_ordr.tpl
new file mode 100644
index 0000000000..415ef03a29
--- /dev/null
+++ b/templates/de/emails/admin/admin_support_ordr.tpl
@@ -0,0 +1,26 @@
+Hallo Administrator,
+
+Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zum Mailversand.
+
+------------------------------
+{--MEMBER_USERID--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
+------------------------------
+Browser: {%server,user_agent%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
diff --git a/templates/de/emails/admin/admin_support_reflink.tpl b/templates/de/emails/admin/admin_support_reflink.tpl
new file mode 100644
index 0000000000..1ba684a75e
--- /dev/null
+++ b/templates/de/emails/admin/admin_support_reflink.tpl
@@ -0,0 +1,26 @@
+Hallo Administrator,
+
+Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinem Referral-Link.
+
+------------------------------
+{--MEMBER_USERID--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
+------------------------------
+Browser: {%server,user_agent%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
diff --git a/templates/de/emails/admin/admin_support_unconfirmed.tpl b/templates/de/emails/admin/admin_support_unconfirmed.tpl
new file mode 100644
index 0000000000..15e4bf1903
--- /dev/null
+++ b/templates/de/emails/admin/admin_support_unconfirmed.tpl
@@ -0,0 +1,26 @@
+Hallo Administrator,
+
+Ein Mitglied aus Ihrem {?mt_word?} hat soeben das Support-Formular ausgef&uuml;llt und hat eine Frage zu seinen unbest&auml;tigten Mails.
+
+------------------------------
+{--MEMBER_USERID--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+IP-Nummer: {%server,remote_addr%} (Real: {%server,real_ip_address%})
+------------------------------
+Browser: {%server,user_agent%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Alternativ zum direkten Mailkontakt k&ouml;nnen Sie sich in den Admin-Bereich einloggen und das Support-System nutzen!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Script
+
+{?URL?}/admin.php
diff --git a/templates/de/emails/member/member_support-ordr.tpl b/templates/de/emails/member/member_support-ordr.tpl
index 88f485db34..84d1ed3b8c 100644
--- a/templates/de/emails/member/member_support-ordr.tpl
+++ b/templates/de/emails/member/member_support-ordr.tpl
@@ -1,22 +1 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
-
-Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
-
-------------------------------
-{--MEMBER_YOUR_USERID_SHORT--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Team
-
-{?URL?}/login.php ({?WEBMASTER?})
+@DEPRECATED
diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl
index 937a893679..84d1ed3b8c 100644
--- a/templates/de/emails/member/member_support-reflink.tpl
+++ b/templates/de/emails/member/member_support-reflink.tpl
@@ -1,22 +1 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
-
-Sie hatten eine Frage zu Ihrem Referral-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
-
-------------------------------
-{--MEMBER_YOUR_USERID_SHORT--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Team
-
-{?URL?}/login.php ({?WEBMASTER?})
+@DEPRECATED
diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl
index b65a9774ac..84d1ed3b8c 100644
--- a/templates/de/emails/member/member_support-unconfirmed.tpl
+++ b/templates/de/emails/member/member_support-unconfirmed.tpl
@@ -1,22 +1 @@
-Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
-
-Sie hatten uns wegen Ihrer unbest&auml;tigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
-
-------------------------------
-{--MEMBER_YOUR_USERID_SHORT--} $userid
-------------------------------
-E-Mail Adresse: {%user,email=$userid%}
-------------------------------
-Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
-------------------------------
-
-$content[text]
-
-------------------------------
-
-Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Ihr {?MAIN_TITLE?} Team
-
-{?URL?}/login.php ({?WEBMASTER?})
+@DEPRECATED
diff --git a/templates/de/emails/member/member_support_ordr.tpl b/templates/de/emails/member/member_support_ordr.tpl
new file mode 100644
index 0000000000..88f485db34
--- /dev/null
+++ b/templates/de/emails/member/member_support_ordr.tpl
@@ -0,0 +1,22 @@
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+
+Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
+
+------------------------------
+{--MEMBER_YOUR_USERID_SHORT--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})
diff --git a/templates/de/emails/member/member_support_reflink.tpl b/templates/de/emails/member/member_support_reflink.tpl
new file mode 100644
index 0000000000..937a893679
--- /dev/null
+++ b/templates/de/emails/member/member_support_reflink.tpl
@@ -0,0 +1,22 @@
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+
+Sie hatten eine Frage zu Ihrem Referral-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
+
+------------------------------
+{--MEMBER_YOUR_USERID_SHORT--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})
diff --git a/templates/de/emails/member/member_support_unconfirmed.tpl b/templates/de/emails/member/member_support_unconfirmed.tpl
new file mode 100644
index 0000000000..b65a9774ac
--- /dev/null
+++ b/templates/de/emails/member/member_support_unconfirmed.tpl
@@ -0,0 +1,22 @@
+Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%},
+
+Sie hatten uns wegen Ihrer unbest&auml;tigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
+
+------------------------------
+{--MEMBER_YOUR_USERID_SHORT--} $userid
+------------------------------
+E-Mail Adresse: {%user,email=$userid%}
+------------------------------
+Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}
+------------------------------
+
+$content[text]
+
+------------------------------
+
+Einer unserer Mitarbeiter wird sich bald bei Ihnen direkt oder per Support-System melden. In beiden F&auml;lllen erhalten Sie eine Mail!
+
+Mit freundlichen Gr&uuml;&szlig;en,
+  Ihr {?MAIN_TITLE?} Team
+
+{?URL?}/login.php ({?WEBMASTER?})