From cf3765c38cf0a76f396aca291f71858936e92956 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 29 Jun 2010 01:19:13 +0000 Subject: [PATCH] A lot code rewritten: - New template-functions.php added and a lot functions moved from functions.php and some from wrapper-functions.php to it. - New EL function doExpressionTemplate() added - New template function doTemplateColorSwitch() added - Heavy rewrite of PHP code and templates to make usage of that new function which should result in an easier PHP code - Some fixes - TODOs.txt updated --- .gitattributes | 1 + DOCS/TODOs.txt | 91 +- inc/config-global.php | 2 +- inc/expression-functions.php | 13 + inc/extensions-functions.php | 7 - inc/functions.php | 1609 +--------------- inc/language/de.php | 2 - inc/libs/admins_functions.php | 22 +- inc/libs/bonus_functions.php | 7 - inc/libs/doubler_functions.php | 4 +- inc/libs/network_functions.php | 24 +- inc/libs/other_functions.php | 7 +- inc/libs/rallye_functions.php | 7 +- inc/libs/register_functions.php | 5 +- inc/libs/task_functions.php | 6 +- inc/libs/user_functions.php | 6 +- inc/modules/admin/admin-inc.php | 8 +- inc/modules/admin/overview-inc.php | 12 +- inc/modules/admin/what-adminedit.php | 14 +- inc/modules/admin/what-admins_mails.php | 12 +- inc/modules/admin/what-chk_regs.php | 6 +- inc/modules/admin/what-config_admins.php | 18 +- inc/modules/admin/what-config_cats.php | 12 +- inc/modules/admin/what-config_email.php | 22 +- inc/modules/admin/what-config_home.php | 8 +- inc/modules/admin/what-config_imprint.php | 8 +- inc/modules/admin/what-config_mods.php | 11 +- inc/modules/admin/what-config_payouts.php | 18 +- inc/modules/admin/what-config_points.php | 18 +- .../admin/what-config_rallye_prices.php | 20 +- inc/modules/admin/what-config_register.php | 6 +- inc/modules/admin/what-config_rewrite.php | 6 +- inc/modules/admin/what-del_transfer.php | 4 +- inc/modules/admin/what-edit_emails.php | 6 +- inc/modules/admin/what-email_archiv.php | 6 +- inc/modules/admin/what-extensions.php | 17 +- inc/modules/admin/what-guestedit.php | 21 +- inc/modules/admin/what-list_autopurge.php | 6 +- inc/modules/admin/what-list_bank_package.php | 6 +- inc/modules/admin/what-list_beg.php | 5 +- inc/modules/admin/what-list_bonus.php | 5 +- inc/modules/admin/what-list_cats.php | 7 +- inc/modules/admin/what-list_country.php | 14 +- inc/modules/admin/what-list_holiday.php | 4 +- inc/modules/admin/what-list_links.php | 7 +- .../what-list_network_array_translation.php | 6 +- .../admin/what-list_network_params.php | 6 +- .../admin/what-list_network_translations.php | 6 +- inc/modules/admin/what-list_network_types.php | 4 +- inc/modules/admin/what-list_networks.php | 8 +- inc/modules/admin/what-list_payouts.php | 4 +- inc/modules/admin/what-list_primera.php | 4 +- inc/modules/admin/what-list_rallyes.php | 14 +- inc/modules/admin/what-list_refs.php | 15 +- inc/modules/admin/what-list_sponsor.php | 6 +- inc/modules/admin/what-list_sponsor_pay.php | 12 +- .../admin/what-list_surfbar_actions.php | 8 +- inc/modules/admin/what-list_surfbar_urls.php | 6 +- inc/modules/admin/what-list_task.php | 6 +- inc/modules/admin/what-list_transfer.php | 5 +- inc/modules/admin/what-list_unconfirmed.php | 9 +- inc/modules/admin/what-list_user.php | 14 +- inc/modules/admin/what-list_wernis.php | 6 +- inc/modules/admin/what-list_yoomedia_tm.php | 8 +- inc/modules/admin/what-memedit.php | 23 +- inc/modules/admin/what-optimize.php | 4 +- inc/modules/admin/what-payments.php | 16 +- inc/modules/admin/what-refbanner.php | 12 +- inc/modules/admin/what-repair_lang.php | 8 +- inc/modules/admin/what-stats_mods.php | 13 +- inc/modules/admin/what-surfbar_stats.php | 11 +- inc/modules/admin/what-theme_edit.php | 4 - inc/modules/admin/what-theme_import.php | 6 +- inc/modules/admin/what-unlock_emails.php | 10 +- inc/modules/admin/what-unlock_sponsor.php | 4 +- .../admin/what-unlock_surfbar_urls.php | 6 +- inc/modules/admin/what-usr_online.php | 4 +- inc/modules/guest/what-active.php | 8 +- inc/modules/guest/what-extensions.php | 6 +- inc/modules/guest/what-sponsor_infos.php | 12 +- inc/modules/guest/what-sponsor_reg.php | 9 +- inc/modules/guest/what-stats.php | 16 +- inc/modules/guest/what-top10.php | 27 +- inc/modules/member/what-beg2.php | 7 +- inc/modules/member/what-bonus.php | 7 +- inc/modules/member/what-categories.php | 8 +- inc/modules/member/what-payout.php | 8 +- inc/modules/member/what-primera.php | 5 +- inc/modules/member/what-refback.php | 3 - inc/modules/member/what-reflinks.php | 6 +- inc/modules/member/what-reflist.php | 3 - inc/modules/member/what-stats.php | 11 +- inc/modules/member/what-surfbar_list.php | 6 +- inc/modules/member/what-themes.php | 22 +- inc/modules/member/what-transfer.php | 8 +- inc/modules/member/what-unconfirmed.php | 7 +- inc/modules/member/what-wernis.php | 6 +- inc/template-functions.php | 1690 +++++++++++++++++ inc/wrapper-functions.php | 46 +- .../admin/admin_admins_mails_edit_row.tpl | 4 +- .../admin/admin_admins_mails_list_row.tpl | 6 +- .../de/html/admin/admin_amenu_delete_row.tpl | 4 +- .../de/html/admin/admin_amenu_edit_row.tpl | 18 +- .../admin/admin_config_admins_del_row.tpl | 10 +- .../admin/admin_config_admins_edit_row.tpl | 10 +- .../de/html/admin/admin_config_admins_row.tpl | 10 +- .../de/html/admin/admin_config_cats_row.tpl | 8 +- .../html/admin/admin_config_email_del_row.tpl | 4 +- .../admin/admin_config_email_edit_row.tpl | 10 +- .../de/html/admin/admin_config_email_row.tpl | 6 +- .../de/html/admin/admin_config_home_row.tpl | 6 +- .../admin/admin_config_payouts_del_row.tpl | 8 +- .../admin/admin_config_payouts_edit_row.tpl | 10 +- .../html/admin/admin_config_payouts_row.tpl | 10 +- .../admin/admin_config_rallye_del_row.tpl | 8 +- .../admin/admin_config_rallye_edit_row.tpl | 8 +- .../admin/admin_config_rallye_prices_row.tpl | 8 +- .../html/admin/admin_config_register_row.tpl | 6 +- .../html/admin/admin_config_rewrite_rows.tpl | 6 +- .../de/html/admin/admin_del_admins_row.tpl | 10 +- .../admin/admin_del_bank_packages_row.tpl | 10 +- .../de/html/admin/admin_del_cats_row.tpl | 4 +- .../admin/admin_del_network_params_row.tpl | 16 +- .../admin/admin_del_network_types_row.tpl | 16 +- .../de/html/admin/admin_del_networks_row.tpl | 30 +- .../de/html/admin/admin_del_payments_row.tpl | 2 +- .../html/admin/admin_del_surfbar_urls_row.tpl | 6 +- .../de/html/admin/admin_del_transfer_row.tpl | 12 +- .../de/html/admin/admin_edit_admins_row.tpl | 12 +- .../admin/admin_edit_bank_packages_row.tpl | 30 +- .../de/html/admin/admin_edit_cats_row.tpl | 12 +- .../de/html/admin/admin_edit_email_row.tpl | 4 +- .../admin/admin_edit_network_params_row.tpl | 16 +- .../admin/admin_edit_network_types_row.tpl | 16 +- .../de/html/admin/admin_edit_networks_row.tpl | 30 +- .../de/html/admin/admin_edit_payments_row.tpl | 16 +- .../de/html/admin/admin_edit_rallyes_row.tpl | 28 +- .../admin/admin_edit_surfbar_urls_row.tpl | 4 +- .../de/html/admin/admin_email_archiv_row.tpl | 28 +- templates/de/html/admin/admin_ext_sql_row.tpl | 4 +- .../admin/admin_extensions_delete_row.tpl | 6 +- .../admin/admin_extensions_delete_row_404.tpl | 4 +- .../html/admin/admin_extensions_edit_row.tpl | 8 +- .../de/html/admin/admin_extensions_row.tpl | 10 +- .../de/html/admin/admin_gmenu_delete_row.tpl | 4 +- .../de/html/admin/admin_gmenu_edit_row.tpl | 14 +- .../de/html/admin/admin_list_admins_row.tpl | 10 +- .../html/admin/admin_list_autopurge_row.tpl | 16 +- .../admin/admin_list_bank_package_row.tpl | 16 +- .../de/html/admin/admin_list_beg_rows.tpl | 10 +- .../de/html/admin/admin_list_bonus_rows.tpl | 10 +- .../de/html/admin/admin_list_cats_row.tpl | 6 +- .../de/html/admin/admin_list_chk_reg_row.tpl | 16 +- .../html/admin/admin_list_country_del_row.tpl | 8 +- .../admin/admin_list_country_edit_row.tpl | 8 +- .../de/html/admin/admin_list_country_row.tpl | 8 +- .../admin/admin_list_doubler_overview.tpl | 24 +- .../de/html/admin/admin_list_holiday_row.tpl | 14 +- .../de/html/admin/admin_list_imprint_row.tpl | 6 +- .../html/admin/admin_list_links_problem.tpl | 2 +- .../de/html/admin/admin_list_links_row.tpl | 8 +- .../de/html/admin/admin_list_mods_row.tpl | 14 +- .../admin/admin_list_network_params_row.tpl | 10 +- .../admin/admin_list_network_types_row.tpl | 10 +- .../de/html/admin/admin_list_networks_row.tpl | 14 +- .../de/html/admin/admin_list_online_row.tpl | 16 +- .../de/html/admin/admin_list_payouts_row.tpl | 12 +- .../de/html/admin/admin_list_primera_row.tpl | 16 +- .../admin/admin_list_rallye_prices_row.tpl | 8 +- .../html/admin/admin_list_rallye_usr_row.tpl | 8 +- .../de/html/admin/admin_list_rallyes_row.tpl | 30 +- .../de/html/admin/admin_list_rallyes_row2.tpl | 8 +- .../de/html/admin/admin_list_refs_row.tpl | 12 +- .../html/admin/admin_list_sponsor_pay_404.tpl | 2 +- .../admin/admin_list_sponsor_pay_del_row.tpl | 10 +- .../admin/admin_list_sponsor_pay_edit_row.tpl | 10 +- .../html/admin/admin_list_sponsor_pay_row.tpl | 10 +- .../de/html/admin/admin_list_sponsor_row.tpl | 28 +- .../html/admin/admin_list_surfbar_actions.tpl | 8 +- .../admin/admin_list_surfbar_actions_row.tpl | 8 +- .../admin/admin_list_surfbar_urls_row.tpl | 16 +- .../html/admin/admin_list_task_ext_rows.tpl | 14 +- .../de/html/admin/admin_list_task_rows.tpl | 14 +- .../de/html/admin/admin_list_transfer_row.tpl | 12 +- .../html/admin/admin_list_unconfirmed_row.tpl | 8 +- .../admin/admin_list_unconfirmed_row_404.tpl | 2 +- .../de/html/admin/admin_list_user_row.tpl | 80 +- .../de/html/admin/admin_list_wernis_row.tpl | 16 +- .../admin/admin_list_yoomedia_tm_already.tpl | 14 +- .../html/admin/admin_list_yoomedia_tm_row.tpl | 14 +- .../admin/admin_lock_surfbar_urls_row.tpl | 10 +- .../de/html/admin/admin_menu_404_row.tpl | 2 +- .../de/html/admin/admin_menu_overview_row.tpl | 10 +- .../de/html/admin/admin_menu_status_row.tpl | 8 +- .../de/html/admin/admin_mmenu_edit_row.tpl | 14 +- .../de/html/admin/admin_mods_edit_row.tpl | 12 +- .../de/html/admin/admin_mods_stats2_row.tpl | 4 +- .../de/html/admin/admin_mods_stats_row.tpl | 4 +- .../de/html/admin/admin_optimize_row.tpl | 10 +- .../de/html/admin/admin_other_sqls_row.tpl | 2 +- .../admin/admin_overview_list_ext_rows.tpl | 14 +- .../html/admin/admin_overview_list_rows.tpl | 14 +- .../de/html/admin/admin_overview_row.tpl | 4 +- .../html/admin/admin_overview_task_rows.tpl | 4 +- .../de/html/admin/admin_payments_list_row.tpl | 10 +- .../de/html/admin/admin_points_del_row.tpl | 4 +- .../de/html/admin/admin_points_edit_row.tpl | 8 +- templates/de/html/admin/admin_points_row.tpl | 6 +- .../html/admin/admin_refbanner_edit_row.tpl | 12 +- .../de/html/admin/admin_refbanner_row.tpl | 12 +- .../html/admin/admin_repair_lang_row_404.tpl | 2 +- .../admin/admin_repair_lang_row_compares.tpl | 2 +- .../html/admin/admin_repair_lang_row_diff.tpl | 2 +- .../de/html/admin/admin_theme_edit_row.tpl | 14 +- .../de/html/admin/admin_theme_import_row.tpl | 12 +- .../admin/admin_undelete_surfbar_urls_row.tpl | 8 +- .../admin/admin_unlock_emails_redir_row.tpl | 4 +- .../de/html/admin/admin_unlock_emails_row.tpl | 16 +- .../html/admin/admin_unlock_sponsor_row.tpl | 8 +- .../admin/admin_unlock_surfbar_urls_row.tpl | 10 +- templates/de/html/guest/guest_active_row.tpl | 6 +- templates/de/html/guest/guest_cat_row.tpl | 2 +- .../de/html/guest/guest_doubler_list_rows.tpl | 6 +- templates/de/html/guest/guest_rallye_row.tpl | 8 +- .../de/html/guest/guest_sponsor_act_row.tpl | 2 +- .../de/html/guest/guest_sponsor_pay_row.tpl | 4 +- .../html/guest/guest_sponsor_payment_row.tpl | 2 +- .../de/html/guest/guest_stats_cats_row.tpl | 4 +- templates/de/html/guest/guest_stats_row.tpl | 4 +- .../de/html/guest/guest_top10_empty4.tpl | 8 +- .../de/html/guest/guest_top10_empty5.tpl | 10 +- .../de/html/guest/guest_top10_row_earner.tpl | 8 +- .../de/html/guest/guest_top10_row_login.tpl | 10 +- .../de/html/guest/guest_top10_row_refs.tpl | 10 +- templates/de/html/member/member_bonus_row.tpl | 8 +- templates/de/html/member/member_cat_row.tpl | 4 +- .../html/member/member_doubler_list_rows.tpl | 8 +- .../de/html/member/member_list_beg_row.tpl | 8 +- .../de/html/member/member_payout_row.tpl | 10 +- .../member/member_primera_mode_list_row.tpl | 8 +- .../de/html/member/member_ref_list_row.tpl | 12 +- .../html/member/member_refback_list_row.tpl | 12 +- .../member_refback_list_row_deleted.tpl | 12 +- .../de/html/member/member_reflinks_row.tpl | 4 +- .../html/member/member_surfbar_list_row.tpl | 12 +- .../de/html/member/member_transfer_row.tpl | 10 +- .../de/html/member/member_unconfirmed_404.tpl | 4 +- .../member_unconfirmed_404_nopoints.tpl | 4 +- .../de/html/member/member_unconfirmed_row.tpl | 10 +- .../member_unconfirmed_row_nopoints.tpl | 8 +- .../member/member_wernis_mode_list_row.tpl | 8 +- 251 files changed, 2758 insertions(+), 3117 deletions(-) create mode 100644 inc/template-functions.php diff --git a/.gitattributes b/.gitattributes index 0efc620c0b..6211e9b59f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -686,6 +686,7 @@ inc/session.php -text inc/sql-functions.php -text inc/stats-functions.php -text inc/stylesheet.php -text +inc/template-functions.php -text inc/weekly/.htaccess -text inc/weekly/weekly_ -text inc/weekly/weekly_surfbar.php -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index abceefeed8..9e5ceb7d0e 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -41,47 +41,39 @@ ./inc/extensions-functions.php:143: // @TODO Do we still need this? setExtensionUpdateNotes(''); ./inc/extensions-functions.php:428:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:544: // @TODO Extension is loaded, what next? -./inc/functions.php:1065:// @TODO $simple/$constants are deprecated -./inc/functions.php:1092: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates -./inc/functions.php:2372: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/functions.php:2521: // @TODO Add a little more infos here -./inc/functions.php:2605: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2628: // @TODO Rewrite this old lost code to a template -./inc/functions.php:266: // @TODO Remove this sanity-check if all is fine -./inc/functions.php:269: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2718: // @TODO Are these convertions still required? -./inc/functions.php:2736:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3620:// @TODO Lame description for this function -./inc/functions.php:3639: // @TODO Move this in a filter -./inc/functions.php:3763: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:542: // @TODO Extension 'msg' does not exist -./inc/functions.php:605:// @TODO Rewrite this to an extension 'smtp' +./inc/functions.php:115: // @TODO Extension 'msg' does not exist +./inc/functions.php:1472: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:1495: // @TODO Rewrite this old lost code to a template +./inc/functions.php:1563: // @TODO Are these convertions still required? +./inc/functions.php:1581:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:178:// @TODO Rewrite this to an extension 'smtp' +./inc/functions.php:2234: // @TODO This is still very static, rewrite it somehow ./inc/install-functions.php:63: // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); -./inc/language/de.php:1143:// @TODO Rewrite these two constants -./inc/language/de.php:1158:// @TODO Rewrite these three constants +./inc/language/de.php:1141:// @TODO Rewrite these two constants +./inc/language/de.php:1156:// @TODO Rewrite these three constants ./inc/language/de.php:309: // @TODO Following two are unused? -./inc/language/de.php:838:// @TODO Are these constants longer used? +./inc/language/de.php:836:// @TODO Are these constants longer used? ./inc/language-functions.php:234: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function. ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings * ./inc/language/refback_de.php:46:// @TODO Rewrite these constants to one ./inc/language/sponsor_de.php:119:// @TODO Rewrite these four constants to one and use sprintf() -./inc/libs/admins_functions.php:440: // @TODO This can be, somehow, rewritten +./inc/libs/admins_functions.php:434: // @TODO This can be, somehow, rewritten ./inc/libs/beg_functions.php:58: // @TODO Try to rewrite the following unset() -./inc/libs/bonus_functions.php:213: // @TODO Move this HTML to a template -./inc/libs/bonus_functions.php:297: // @TODO This query isn't right, it will only update if the user was for a longer time away! +./inc/libs/bonus_functions.php:206: // @TODO Move this HTML to a template +./inc/libs/bonus_functions.php:290: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/libs/doubler_functions.php:46:// @TODO Lame description ./inc/libs/doubler_functions.php:94: // @TODO Can't this be moved into EL? ./inc/libs/mailid_functions.php:49: // @TODO Rewrite this to a dynamic include or so -./inc/libs/rallye_functions.php:703:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() -./inc/libs/rallye_functions.php:773: $EXPIRE = 3; // @TODO The hard-coded value... -./inc/libs/rallye_functions.php:859:// @TODO Please document this function -./inc/libs/rallye_functions.php:915: // Load count @TODO Can't we rewrite this to our API? +./inc/libs/rallye_functions.php:700:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() +./inc/libs/rallye_functions.php:768: $EXPIRE = 3; // @TODO The hard-coded value... +./inc/libs/rallye_functions.php:854:// @TODO Please document this function +./inc/libs/rallye_functions.php:910: // Load count @TODO Can't we rewrite this to our API? ./inc/libs/refback_functions.php:61: // @TODO Try to rewrite the following unset() -./inc/libs/register_functions.php:299: // @TODO Rewrite these all to a single filter -./inc/libs/register_functions.php:375: // @TODO Rewrite this to a filter -./inc/libs/register_functions.php:382: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete -./inc/libs/register_functions.php:383: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable +./inc/libs/register_functions.php:296: // @TODO Rewrite these all to a single filter +./inc/libs/register_functions.php:372: // @TODO Rewrite this to a filter +./inc/libs/register_functions.php:379: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete +./inc/libs/register_functions.php:380: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable ./inc/libs/surfbar_functions.php:1541: // @TODO This can be somehow rewritten ./inc/libs/surfbar_functions.php:713:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/surfbar_functions.php:957: // @TODO Invalid salt should be refused @@ -102,10 +94,10 @@ ./inc/modules/admin/admin-inc.php:338: // @TODO ACL is 'allow'... hmmm ./inc/modules/admin/admin-inc.php:438:// @TODO Try to rewrite this to adminAddMenuSelectionBox() ./inc/modules/admin/overview-inc.php:164: // @TODO Rewrite this to a filter -./inc/modules/admin/overview-inc.php:278: // @TODO Rewrite this to something with include files and/or filter -./inc/modules/admin/overview-inc.php:316: // @TODO This may also be rewritten to include files -./inc/modules/admin/overview-inc.php:318: default: // @TODO Unknown support mode -./inc/modules/admin/overview-inc.php:436: // @TODO Try to move this in includes +./inc/modules/admin/overview-inc.php:277: // @TODO Rewrite this to something with include files and/or filter +./inc/modules/admin/overview-inc.php:315: // @TODO This may also be rewritten to include files +./inc/modules/admin/overview-inc.php:317: default: // @TODO Unknown support mode +./inc/modules/admin/overview-inc.php:432: // @TODO Try to move this in includes ./inc/modules/admin/overview-inc.php:45:// @TODO This function does also check for uncompleted tasks ./inc/modules/admin/what-add_guestnl_cat.php:49: // @TODO Check if category does already exist ./inc/modules/admin/what-add_surfbar_url.php:57: // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData @@ -115,43 +107,43 @@ ./inc/modules/admin/what-adminedit.php:58: // @TODO Kill all constants in this file ./inc/modules/admin/what-admins_mails.php:61: // @TODO Can this be rewritten to an API function? ./inc/modules/admin/what-bonus.php:48:// @TODO Unused at the moment -./inc/modules/admin/what-config_admins.php:132: // @TODO Rewrite this to filter 'run_sqls' +./inc/modules/admin/what-config_admins.php:126: // @TODO Rewrite this to filter 'run_sqls' ./inc/modules/admin/what-config_mods.php:57: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function ./inc/modules/admin/what-config_points.php:113: // @TODO Rewrite this to a filter -./inc/modules/admin/what-config_rallye_prices.php:207: // @TODO Rewrite these two constants -./inc/modules/admin/what-config_register.php:78: // @TODO Move this HTML code into a template +./inc/modules/admin/what-config_rallye_prices.php:197: // @TODO Rewrite these two constants +./inc/modules/admin/what-config_register.php:77: // @TODO Move this HTML code into a template ./inc/modules/admin/what-del_email.php:60: // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price'); ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country * ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment -./inc/modules/admin/what-extensions.php:282: // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver -./inc/modules/admin/what-extensions.php:363: // @TODO Rewrite this to a filter +./inc/modules/admin/what-extensions.php:277: // @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver +./inc/modules/admin/what-extensions.php:356: // @TODO Rewrite this to a filter ./inc/modules/admin/what-guest_add.php:137: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-guest_add.php:69: // @TODO Cant this be rewritten? ./inc/modules/admin/what-guest_add.php:85: // @TODO This can be somehow rewritten to a function ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment ./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter -./inc/modules/admin/what-list_bonus.php:135: // @TODO Can't this be moved into our expression language? +./inc/modules/admin/what-list_bonus.php:134: // @TODO Can't this be moved into our expression language? ./inc/modules/admin/what-list_cats.php:56: // @TODO No longer needed? define('__CATEGORIES_BASE' , 'mail_title in template -./inc/modules/admin/what-refbanner.php:145: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template +./inc/modules/admin/what-payments.php:148: // @TODO Rewritings: title->mail_title in template +./inc/modules/admin/what-refbanner.php:143: // @TODO Rewritings: alt->alternate,cnt->counter,clx->clicks in template ./inc/modules/admin/what-unlock_emails.php:89: // @TODO Rewrite these if-blocks to a filter ./inc/modules/admin/what-usage.php:88: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php ./inc/modules/admin/what-usr_online.php:51: // @TODO Add a filter for sponsor @@ -171,11 +163,13 @@ ./inc/modules/member/what-categories.php:129: // @TODO Rewrite this to use $OUT .= ... ./inc/modules/member/what-order.php:457: // @TODO Rewrite this to a filter ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter -./inc/modules/member/what-payout.php:218: // @TODO Rewrite this to a filter +./inc/modules/member/what-payout.php:216: // @TODO Rewrite this to a filter ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter? ./inc/modules/member/what-rallyes.php:91: // @TODO Reactivate this: $content['admin'] = '' . $content['login'] . ''; -./inc/modules/member/what-refback.php:128: // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); +./inc/modules/member/what-refback.php:126: // @TODO UNUSED: $refRow['status'] = translateUserStatus($refRow['status']); ./inc/modules/member/what-reflinks.php:54:// @TODO Move this into a filter +./inc/modules/member/what-stats.php:74: // @TODO More usage of EL at this array +./inc/modules/member/what-themes.php:116: // @TODO Move this code into a template ./inc/modules/member/what-transfer.php:132: // @TODO Rewrite this to a filter ./inc/modules/member/what-transfer.php:222: // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries ./inc/modules/member/what-transfer.php:304: // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries @@ -195,6 +189,13 @@ ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye ./inc/reset/reset_birthday.php:91: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/revision-functions.php:153:// @TODO Please describe this function +./inc/template-functions.php:1155: // @TODO This can be easily moved out after the merge from EL branch to this is complete +./inc/template-functions.php:1188: // @TODO Add a little more infos here +./inc/template-functions.php:1473:// @TODO Lame description for this function +./inc/template-functions.php:1492: // @TODO Move this in a filter +./inc/template-functions.php:280: // @TODO Remove this sanity-check if all is fine +./inc/template-functions.php:595:// @TODO $simple/$constants are deprecated +./inc/template-functions.php:622: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates ./inc/wrapper-functions.php:127:// @TODO Implement $compress ./inc/wrapper-functions.php:134:// @TODO Implement $decompress ./inc/wrapper-functions.php:455:// @TODO Do some more sanity check here diff --git a/inc/config-global.php b/inc/config-global.php index 2861f71424..dc5edaaacb 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -56,7 +56,7 @@ error_reporting(E_ALL | E_STRICT); $PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3)); // Some very important function includes -foreach (array('config','wrapper','inc','stats') as $inc) { +foreach (array('config','wrapper','template','inc','stats') as $inc) { include($PATH . 'inc/' . $inc . '-functions.php'); } // END - foreach diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 6a7ca12bf6..d44b587edd 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -236,5 +236,18 @@ function doExpressionMessage ($data) { return $code; } +// Expression call-back for template functions +function doExpressionTemplate ($data) { + // Do the replacement + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template='.$GLOBALS['current_template']); + $replacer = '{DQUOTE} . doTemplate' . $data['callback'] . "('" . $GLOBALS['current_template'] . "', true) . {DQUOTE}"; + + // Replace the code + $code = replaceExpressionCode($data, $replacer); + + // Return the (maybe) replaced code + return $code; +} + // [EOF] ?> diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 9c5771d453..af6f615564 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -738,9 +738,6 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Do we have queries? if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) { - // Init switch color - $SW = 2; - // Get all SQLs foreach (getExtensionSqls() as $sqls) { // New array format is recursive @@ -752,16 +749,12 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false if (!empty($sql)) { // Prepare output for template $content = array( - 'sw' => $SW, 'i' => ($idx+1), 'sql' => $sql ); // Load row template $OUT .= loadTemplate('admin_ext_sql_row', true, $content); - - // Switch color - $SW = 3 - $SW; } // END - if } // END - foreach } // END - foreach diff --git a/inc/functions.php b/inc/functions.php index 673c8e822c..6f82e17789 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -42,80 +42,6 @@ if (!defined('__SECURITY')) { die(); } // END - if -// Output HTML code directly or 'render' it. You addionally switch the new-line character off -function outputHtml ($htmlCode, $newLine = true) { - // Init output - if (!isset($GLOBALS['output'])) { - $GLOBALS['output'] = ''; - } // END - if - - // Do we have HTML-Code here? - if (!empty($htmlCode)) { - // Yes, so we handle it as you have configured - switch (getConfig('OUTPUT_MODE')) { - case 'render': - // That's why you don't need any \n at the end of your HTML code... :-) - if (getPhpCaching() == 'on') { - // Output into PHP's internal buffer - outputRawCode($htmlCode); - - // That's why you don't need any \n at the end of your HTML code... :-) - if ($newLine === true) print("\n"); - } else { - // Render mode for old or lame servers... - $GLOBALS['output'] .= $htmlCode; - - // That's why you don't need any \n at the end of your HTML code... :-) - if ($newLine === true) $GLOBALS['output'] .= "\n"; - } - break; - - case 'direct': - // If we are switching from render to direct output rendered code - if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; } - - // The same as above... ^ - outputRawCode($htmlCode); - if ($newLine === true) print("\n"); - break; - - default: - // Huh, something goes wrong or maybe you have edited config.php ??? - debug_report_bug(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}'); - break; - } // END - switch - } elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) { - // Output cached HTML code - $GLOBALS['output'] = ob_get_contents(); - - // Clear output buffer for later output if output is found - if (!empty($GLOBALS['output'])) { - clearOutputBuffer(); - } // END - if - - // Send all HTTP headers - sendHttpHeaders(); - - // Compile and run finished rendered HTML code - compileFinalOutput(); - - // Output code here, DO NOT REMOVE! ;-) - outputRawCode($GLOBALS['output']); - } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) { - // Send all HTTP headers - sendHttpHeaders(); - - // Compile and run finished rendered HTML code - compileFinalOutput(); - - // Output code here, DO NOT REMOVE! ;-) - outputRawCode($GLOBALS['output']); - } else { - // And flush all headers - flushHeaders(); - } -} - // Sends out all headers required for HTTP/1.1 reply function sendHttpHeaders () { // Used later @@ -134,91 +60,6 @@ function sendHttpHeaders () { sendHeader('Content-Language: ' . getLanguage()); } -// Compiles the final output -function compileFinalOutput () { - // Add page header and footer - addPageHeaderFooter(); - - // Do the final compilation - $GLOBALS['output'] = doFinalCompilation($GLOBALS['output']); - - // Extension 'rewrite' installed? - if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) { - $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']); - } // END - if - - // Compress it? - if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) { - // Compress it for HTTP gzip - $GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true); - - // Add header - sendHeader('Content-Encoding: gzip'); - } elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) { - // Compress it for HTTP deflate - $GLOBALS['output'] = gzcompress($GLOBALS['output'], 9); - - // Add header - sendHeader('Content-Encoding: deflate'); - } - - // Add final length - sendHeader('Content-Length: ' . strlen($GLOBALS['output'])); - - // Flush all headers - flushHeaders(); -} - -// Main compilation loop -function doFinalCompilation ($code, $insertComments = true) { - // Insert comments? (Only valid with HTML templates, of course) - enableTemplateHtml($insertComments); - - // Init counter - $cnt = 0; - - // Compile all out - while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 4)) { - // Init common variables - $content = array(); - $newContent = ''; - - // Compile it - //* DEBUG: */ debugOutput('
'.encodeEntities($code).'
'); - $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";'; - //* DEBUG: */ if ($insertComments) die('
'.linenumberCode($eval).'
'); - eval($eval); - //* DEBUG: */ die('
'.encodeEntities($newContent).'
'); - - // Was that eval okay? - if (empty($newContent)) { - // Something went wrong! - debug_report_bug(__FUNCTION__, __LINE__, 'Evaluation error:
' . linenumberCode($eval) . '
', false); - } // END - if - - // Use it again - $code = $newContent; - - // Count round - $cnt++; - } // END - while - - // Return the compiled code - return $code; -} - -// Output the raw HTML code -function outputRawCode ($htmlCode) { - // Output stripped HTML code to avoid broken JavaScript code, etc. - print(str_replace('{BACK}', "\\", $htmlCode)); - - // Flush the output if only getPhpCaching() is not 'on' - if (getPhpCaching() != 'on') { - // Flush it - flush(); - } // END - if -} - // Init fatal message array function initFatalMessages () { $GLOBALS['fatal_messages'] = array(); @@ -261,274 +102,6 @@ function getTotalFatalErrors () { return $count; } -// Load a template file and return it's content (only it's name; do not use ' or ") -function loadTemplate ($template, $return = false, $content = array()) { - // @TODO Remove this sanity-check if all is fine - if (!is_bool($return)) debug_report_bug(__FUNCTION__, __LINE__, 'return is not bool (' . gettype($return) . ')'); - - // @TODO Try to rewrite all $DATA to $content - global $DATA; - - // Do we have cache? - if ((isDebuggingTemplateCache() === false) && (isTemplateCached($template))) { - // Evaluate the cache - eval(readTemplateCache($template)); - } elseif (!isset($GLOBALS['template_eval'][$template])) { - // Make all template names lowercase - $template = strtolower($template); - - // Init some data - $ret = ''; - if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0'; - - // Base directory - $basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage()); - $extraPath = detectExtraTemplatePath($template);; - - //////////////////////// - // Generate file name // - //////////////////////// - $FQFN = $basePath . $extraPath . $template . '.tpl'; - - // Does the special template exists? - if (!isFileReadable($FQFN)) { - // Reset to default template - $FQFN = $basePath . $template . '.tpl'; - } // END - if - - // Now does the final template exists? - if (isFileReadable($FQFN)) { - // Count the template load - incrementConfigEntry('num_templates'); - - // The local file does exists so we load it. :) - $GLOBALS['tpl_content'] = readFromFile($FQFN); - - // Do we have to compile the code? - $ret = ''; - if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) { - // Normal HTML output? - if (getOutputMode() == '0') { - // Add surrounding HTML comments to help finding bugs faster - $ret = '\n" . $GLOBALS['tpl_content'] . '\n"; - - // Prepare eval() command - $eval = '$ret = "' . compileCode(escapeQuotes($ret)) . '";'; - } elseif (substr($template, 0, 3) == 'js_') { - // JavaScripts don't like entities and timings - $eval = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");'; - } else { - // Prepare eval() command, other output doesn't like entities, maybe - $eval = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");'; - } - } else { - // Add surrounding HTML comments to help finding bugs faster - $ret = '\n" . $GLOBALS['tpl_content'] . '\n"; - $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";'; - } // END - if - - // Cache the eval() command here - $GLOBALS['template_eval'][$template] = $eval; - } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { - // Only admins shall see this warning or when installation mode is active - $ret = '
- {--TEMPLATE_404--} -
-
- (' . $template . ') -
-
- {--TEMPLATE_CONTENT--} - 
' . print_r($content, true) . '
- {--TEMPLATE_DATA--} - 
' . print_r($DATA, true) . '
-
'; - } else { - // No file! - $GLOBALS['template_eval'][$template] = '404'; - } - } - - // Code set? - if ((isset($GLOBALS['template_eval'][$template])) && ($GLOBALS['template_eval'][$template] != '404')) { - // Eval the code - eval($GLOBALS['template_eval'][$template]); - } // END - if - - // Do we have some content to output or return? - if (!empty($ret)) { - // Not empty so let's put it out! ;) - if ($return === true) { - // Return the HTML code - return $ret; - } else { - // Output directly - outputHtml($ret); - } - } elseif (isDebugModeEnabled()) { - // Warning, empty output! - return 'E:' . $template . ',content=
' . print_r($content, true) . '
'; - } -} - -// Detects the extra template path from given template name -function detectExtraTemplatePath ($template) { - // Default is empty - $extraPath = ''; - - // Do we have cache? - if (!isset($GLOBALS['extra_path'][$template])) { - // Check for admin/guest/member/etc. templates - if (substr($template, 0, 6) == 'admin_') { - // Admin template found - $extraPath = 'admin/'; - } elseif (substr($template, 0, 6) == 'guest_') { - // Guest template found - $extraPath = 'guest/'; - } elseif (substr($template, 0, 7) == 'member_') { - // Member template found - $extraPath = 'member/'; - } elseif (substr($template, 0, 7) == 'select_') { - // Selection template found - $extraPath = 'select/'; - } elseif (substr($template, 0, 8) == 'install_') { - // Installation template found - $extraPath = 'install/'; - } elseif (substr($template, 0, 4) == 'ext_') { - // Extension template found - $extraPath = 'ext/'; - } elseif (substr($template, 0, 3) == 'la_') { - // 'Logical-area' template found - $extraPath = 'la/'; - } elseif (substr($template, 0, 3) == 'js_') { - // JavaScript template found - $extraPath = 'js/'; - } elseif (substr($template, 0, 5) == 'menu_') { - // Menu template found - $extraPath = 'menu/'; - } else { - // Test for extension - $test = substr($template, 0, strpos($template, '_')); - - // Probe for valid extension name - if (isExtensionNameValid($test)) { - // Set extra path to extension's name - $extraPath = $test . '/'; - } // END - if - } - - // Store it in cache - $GLOBALS['extra_path'][$template] = $extraPath; - } // END - if - - // Return result - return $GLOBALS['extra_path'][$template]; -} - -// Loads an email template and compiles it -function loadEmailTemplate ($template, $content = array(), $userid = '0') { - global $DATA; - - // Make sure all template names are lowercase! - $template = strtolower($template); - - // Is content an array? - if (is_array($content)) { - // Add expiration to array - if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) { - // Will never expire! - $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}'; - } elseif (isConfigEntrySet('auto_purge')) { - // Create nice date string - $content['expiration'] = createFancyTime(getConfig('auto_purge')); - } else { - // Missing entry - $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}'; - } - } // END - if - - // Load user's data - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content)); - if (($userid > 0) && (is_array($content))) { - // If nickname extension is installed, fetch nickname as well - if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME!
"); - // Load by nickname - fetchUserData($userid, 'nickname'); - } else { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK!
"); - /// Load by userid - fetchUserData($userid); - } - - // Merge data if valid - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE
"); - if (isUserDataValid()) { - $content = merge_array($content, getUserDataArray()); - } // END - if - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER
"); - } // END - if - - // Base directory - $basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage()); - - // Detect extra path - $extraPath = detectExtraTemplatePath($template); - - // Generate full FQFN - $FQFN = $basePath . $extraPath . $template . '.tpl'; - - // Does the special template exists? - if (!isFileReadable($FQFN)) { - // Reset to default template - $FQFN = $basePath . $template . '.tpl'; - } // END - if - - // Now does the final template exists? - $newContent = ''; - if (isFileReadable($FQFN)) { - // The local file does exists so we load it. :) - $GLOBALS['tpl_content'] = readFromFile($FQFN); - - // Run code - $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");'; - eval($GLOBALS['tpl_content']); - } elseif (!empty($template)) { - // Template file not found! - $newContent = '
- {--TEMPLATE_404--}: ' . $template . ' -
-
- {--TEMPLATE_CONTENT--} - 
' . print_r($content, true) . '
- {--TEMPLATE_DATA--} - 
' . print_r($DATA, true) . '
-
'; - - // Debug mode not active? Then remove the HTML tags - if (!isDebugModeEnabled()) $newContent = secureString($newContent); - } else { - // No template name supplied! - $newContent = '{--NO_TEMPLATE_SUPPLIED--}'; - } - - // Is there some content? - if (empty($newContent)) { - // Compiling failed - $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content']; - - // Add last error if the required function exists - if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx."; - } // END - if - - // Remove content and data - unset($content); - unset($DATA); - - // Return content - return $newContent; -} - // Send mail out to an email address function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '') { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}
"); @@ -890,25 +463,6 @@ function translateMenuVisibleLocked ($content, $prefix = '') { return $content; } -// "Getter" for menu CSS classes, mainly used in templates -function getMenuCssClasses ($data) { - // $data needs to be converted into an array - $content = explode('|', $data); - - // Non-existent index 2 will happen in menu blocks - if (!isset($content[2])) $content[2] = ''; - - // Re-construct the array: 0=visible,1=locked,2=prefix - $content['visible'] = $content[0]; - $content['locked'] = $content[1]; - - // Call our "translator" function - $content = translateMenuVisibleLocked($content, $content[2]); - - // Return CSS classes - return ($content['visible_css'] . ' ' . $content['locked_css']); -} - // Generates an URL for the dereferer function generateDerefererUrl ($URL) { // Don't de-refer our own links! @@ -953,11 +507,6 @@ function countSelection ($array) { return $ret; } -// Generate XHTML code for the CAPTCHA -function generateCaptchaCode ($code, $type, $DATA, $userid) { - return 'Code ' . $code . ''; -} - // Generates a timestamp (some wrapper for mktime()) function makeTime ($hours, $minutes, $seconds, $stamp) { // Extract day, month and year from given timestamp @@ -1028,117 +577,6 @@ function redirectToUrl ($URL, $allowSpider = true) { shutdown(); } -// Wrapper for redirectToUrl but URL comes from a configuration entry -function redirectToConfiguredUrl ($configEntry) { - // Load the URL - redirectToUrl(getConfig($configEntry)); -} - -// Compiles the given HTML/mail code -function compileCode ($code, $simple = false, $constants = true, $full = true) { - // Is the code a string? - if (!is_string($code)) { - // Silently return it - return $code; - } // END - if - - // Start couting - $startCompile = microtime(true); - - // Comile the code - $code = compileRawCode($code, $simple, $constants, $full); - - // Get timing - $compiled = microtime(true); - - // Add timing if enabled - if (isTemplateHtml()) { - // Add timing, this should be disabled in - $code .= ''; - } // END - if - - // Return compiled code - return $code; -} - -// Compiles the code (use compileCode() only for HTML because of the comments) -// @TODO $simple/$constants are deprecated -function compileRawCode ($code, $simple = false, $constants = true, $full = true) { - // Is the code a string? - if (!is_string($code)) { - // Silently return it - return $code; - } // END - if - - // Init replacement-array with smaller set of security characters - $secChars = $GLOBALS['url_chars']; - - // Select full set of chars to replace when we e.g. want to compile URLs - if ($full === true) $secChars = $GLOBALS['security_chars']; - - // Compile more through a filter - $code = runFilterChain('compile_code', $code); - - // Compile message strings - $code = str_replace('{--', '{%message,', str_replace('--}', '%}', $code)); - - // Compile QUOT and other non-HTML codes - foreach ($secChars['to'] as $k => $to) { - // Do the reversed thing as in inc/libs/security_functions.php - $code = str_replace($to, $secChars['from'][$k], $code); - } // END - foreach - - // Find $content[bla][blub] entries - // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates - preg_match_all('/\$(content|GLOBALS|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches); - - // Are some matches found? - if ((count($matches) > 0) && (count($matches[0]) > 0)) { - // Replace all matches - $matchesFound = array(); - foreach ($matches[0] as $key => $match) { - // Fuzzy look has failed by default - $fuzzyFound = false; - - // Fuzzy look on match if already found - foreach ($matchesFound as $found => $set) { - // Get test part - $test = substr($found, 0, strlen($match)); - - // Does this entry exist? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "found={$found},match={$match},set={$set}
"); - if ($test == $match) { - // Match found! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "fuzzyFound!
"); - $fuzzyFound = true; - break; - } // END - if - } // END - foreach - - // Skip this entry? - if ($fuzzyFound === true) continue; - - // Take all string elements - if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[4][$key]]))) { - // Replace it in the code - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "key={$key},match={$match}
"); - $newMatch = str_replace('[', "['", str_replace(']', "']", $match)); - $code = str_replace($match, '".' . $newMatch . '."', $code); - $matchesFound[$key . '_' . $matches[4][$key]] = 1; - $matchesFound[$match] = 1; - } elseif (!isset($matchesFound[$match])) { - // Not yet replaced! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "match={$match}
"); - $code = str_replace($match, '".' . $match . '."', $code); - $matchesFound[$match] = 1; - } - } // END - foreach - } // END - if - - // Return it - return $code; -} - /************************************************************************ * * * Gaenderter Sortier-Algorythmus, $array wird nach dem Array (!) * @@ -1190,118 +628,6 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums $array = $dummy; } -// -function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') { - $OUT = ''; - - if ($type == 'yn') { - // This is a yes/no selection only! - if ($id > 0) $prefix .= '[' . $id . ']'; - $OUT .= ''; - } - - switch ($type) { - case 'day': // Day - for ($idx = 1; $idx < 32; $idx++) { - $OUT .= ''; - } // END - for - } else { - // Get current year and subtract the configured minimum age - $OUT .= ''; - // Calculate earliest year depending on extension version - if (isExtensionInstalledAndNewer('order', '0.2.1')) { - // Use configured minimum age - $year = date('Y', time()) - getConfig('min_age'); - } else { - // Use fixed 16 years age - $year = date('Y', time()) - 16; - } - - // Construct year selection list - for ($idx = $minYear; $idx <= $year; $idx++) { - $OUT .= '