From 6d08952d672c5a5de7d8522f894a5665599a2a4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 1 Jun 2013 17:17:05 +0000 Subject: [PATCH] Renamed templates + added some filters for mail order --- .gitattributes | 8 + DOCS/TODOs.txt | 152 +++++++++--------- inc/extensions-functions.php | 14 +- inc/extensions/ext-holiday.php | 6 +- inc/extensions/ext-html_mail.php | 68 +------- inc/extensions/ext-refback.php | 1 + inc/extensions/ext-rewrite.php | 8 +- inc/extensions/ext-sql_patches.php | 4 +- inc/extensions/ext-user.php | 10 +- inc/extensions/holiday/mode-update.php | 6 + inc/extensions/html_mail/.htaccess | 1 + inc/extensions/html_mail/mode-update.php | 115 +++++++++++++ inc/extensions/sql_patches/mode-remove.php | 1 - inc/extensions/sql_patches/mode-update.php | 11 +- inc/extensions/user/mode-update.php | 6 + inc/filter/holiday_filter.php | 72 +++++++++ inc/filter/theme_filter.php | 4 +- inc/language/beg_de.php | 8 +- inc/language/birthday_de.php | 2 +- inc/language/bonus_de.php | 2 +- inc/language/coupon_de.php | 2 +- inc/language/de.php | 26 +-- inc/language/earning_de.php | 2 +- inc/language/mailid_de.php | 10 +- inc/language/network_de.php | 14 +- inc/language/payout_de.php | 3 +- inc/language/rallye_de.php | 2 +- inc/language/sponsor_de.php | 2 +- inc/language/wernis_de.php | 2 +- inc/language/yoomedia_de.php | 2 +- inc/libs/payout_functions.php | 4 +- inc/modules/member/what-order.php | 74 +++------ inc/modules/member/what-payout.php | 31 +++- inc/modules/member/what-support.php | 6 +- inc/xml-functions.php | 2 +- .../de/emails/admin/admin_support-ordr.tpl | 27 +--- .../de/emails/admin/admin_support-reflink.tpl | 27 +--- .../admin/admin_support-unconfirmed.tpl | 27 +--- .../de/emails/admin/admin_support_ordr.tpl | 26 +++ .../de/emails/admin/admin_support_reflink.tpl | 26 +++ .../admin/admin_support_unconfirmed.tpl | 26 +++ .../de/emails/member/member_support-ordr.tpl | 23 +-- .../emails/member/member_support-reflink.tpl | 23 +-- .../member/member_support-unconfirmed.tpl | 23 +-- .../de/emails/member/member_support_ordr.tpl | 22 +++ .../emails/member/member_support_reflink.tpl | 22 +++ .../member/member_support_unconfirmed.tpl | 22 +++ 47 files changed, 561 insertions(+), 414 deletions(-) create mode 100644 inc/extensions/html_mail/.htaccess create mode 100644 inc/extensions/html_mail/mode-update.php create mode 100644 templates/de/emails/admin/admin_support_ordr.tpl create mode 100644 templates/de/emails/admin/admin_support_reflink.tpl create mode 100644 templates/de/emails/admin/admin_support_unconfirmed.tpl create mode 100644 templates/de/emails/member/member_support_ordr.tpl create mode 100644 templates/de/emails/member/member_support_reflink.tpl create mode 100644 templates/de/emails/member/member_support_unconfirmed.tpl 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' , '' . $content['login'] . ''; ./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