]> git.mxchange.org Git - mailer.git/commitdiff
Mailer project continued (heavy refactoring):
authorRoland Häder <roland@mxchange.org>
Sat, 10 Nov 2012 00:45:58 +0000 (00:45 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 10 Nov 2012 00:45:58 +0000 (00:45 +0000)
- Added all missing nodes in all XML templates to allow $content being handled
  by referred HTML templates
- This means that you can pass "dynamic" content through the XML sub system to
  the templates as usual. If you do so, a generic 'rows' array element is being
  used for the row output
- Refactured all form-tags to EL code to allow e.g. adding session id to all
  forms or (not yet added) TAN numbers to combat any kind of form spamming and
  accidentally done re-submits
- Including closing form tag
- In the above process, onsubmit/onreset are now strongly discouraged as you
  should better use the jQuery AJAX framework
- Other rewrites/refacturings I cannot remember
- TODOs.txt updated

361 files changed:
DOCS/TODOs.txt
DOCS/tpl-validator.php
inc/callback-functions.php
inc/classes/cachesystem.class.php
inc/config-functions.php
inc/config-global.php
inc/db/lib-mysql3.php
inc/expression-functions.php
inc/extensions/ext-html_mail.php
inc/extensions/ext-network.php
inc/extensions/ext-newsletter.php
inc/filter-functions.php
inc/filter/online_filter.php
inc/filters.php
inc/functions.php
inc/http-functions.php
inc/install-functions.php
inc/language/network_de.php
inc/language/nickname_de.php
inc/language/surfbar_de.php
inc/libs/admins_functions.php
inc/libs/holiday_functions.php
inc/libs/html_mail_functions.php
inc/libs/network_functions.php
inc/libs/rallye_functions.php
inc/libs/task_functions.php
inc/libs/theme_functions.php
inc/libs/yoomedia_functions.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/subid-stats.php
inc/modules/admin/what-list_autopurge.php
inc/modules/admin/what-list_network_array_translation.php
inc/modules/admin/what-list_network_request_params.php
inc/modules/admin/what-list_network_types.php
inc/modules/admin/what-list_network_vcheck_params.php
inc/modules/admin/what-list_nickname.php
inc/modules/admin/what-list_user_subid.php
inc/modules/admin/what-updates.php
inc/modules/member/what-order.php
inc/mysql-manager.php
inc/purge/purge-inact.php
inc/purge/purge-unconfirmed.php
inc/revision-functions.php
inc/session-functions.php
inc/session.php
inc/template-functions.php
inc/wrapper-functions.php
inc/xml-functions.php
templates/de/html/admin/admin_add_admin_menu.tpl
templates/de/html/admin/admin_add_admins.tpl
templates/de/html/admin/admin_add_admins_acl.tpl
templates/de/html/admin/admin_add_bank_package.tpl
templates/de/html/admin/admin_add_cat.tpl
templates/de/html/admin/admin_add_config_network_type.tpl
templates/de/html/admin/admin_add_config_network_type_form.tpl
templates/de/html/admin/admin_add_country.tpl
templates/de/html/admin/admin_add_forced_ad.tpl
templates/de/html/admin/admin_add_forced_campaign.tpl
templates/de/html/admin/admin_add_forced_costs.tpl
templates/de/html/admin/admin_add_grade_data.tpl
templates/de/html/admin/admin_add_guest_menu.tpl
templates/de/html/admin/admin_add_max.tpl
templates/de/html/admin/admin_add_member_menu.tpl
templates/de/html/admin/admin_add_network.tpl
templates/de/html/admin/admin_add_network_array_translation.tpl
templates/de/html/admin/admin_add_network_request_param.tpl
templates/de/html/admin/admin_add_network_type.tpl
templates/de/html/admin/admin_add_network_vcheck_param.tpl
templates/de/html/admin/admin_add_payment.tpl
templates/de/html/admin/admin_add_payout.tpl
templates/de/html/admin/admin_add_point_accounts.tpl
templates/de/html/admin/admin_add_points.tpl
templates/de/html/admin/admin_add_points_all.tpl
templates/de/html/admin/admin_add_rallye.tpl
templates/de/html/admin/admin_add_rallye_prices.tpl
templates/de/html/admin/admin_add_refbanner.tpl
templates/de/html/admin/admin_add_reflevel.tpl
templates/de/html/admin/admin_add_sponsor.tpl
templates/de/html/admin/admin_add_sponsor_already.tpl
templates/de/html/admin/admin_add_sponsor_paytype.tpl
templates/de/html/admin/admin_add_surfbar_url.tpl
templates/de/html/admin/admin_add_tester_user.tpl
templates/de/html/admin/admin_admins_contct_form.tpl
templates/de/html/admin/admin_admins_mails_edit.tpl
templates/de/html/admin/admin_admins_mails_list.tpl
templates/de/html/admin/admin_config_
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_coupon.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_home.tpl
templates/de/html/admin/admin_config_home_settings_pro.tpl
templates/de/html/admin/admin_config_mediadata.tpl
templates/de/html/admin/admin_config_menu.tpl
templates/de/html/admin/admin_config_network_api.tpl
templates/de/html/admin/admin_config_network_types.tpl
templates/de/html/admin/admin_config_newsletter.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_config_payouts.tpl
templates/de/html/admin/admin_config_point_settings.tpl
templates/de/html/admin/admin_config_proxy.tpl
templates/de/html/admin/admin_config_refback.tpl
templates/de/html/admin/admin_config_refid.tpl
templates/de/html/admin/admin_config_register.tpl
templates/de/html/admin/admin_config_register2.tpl
templates/de/html/admin/admin_config_removeip.tpl
templates/de/html/admin/admin_config_rewrite.tpl
templates/de/html/admin/admin_config_secure.tpl
templates/de/html/admin/admin_config_session.tpl
templates/de/html/admin/admin_config_sponsor.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_sub_points.tpl
templates/de/html/admin/admin_config_surfbar.tpl
templates/de/html/admin/admin_config_timezone.tpl
templates/de/html/admin/admin_config_title.tpl
templates/de/html/admin/admin_config_top10.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_config_validator.tpl
templates/de/html/admin/admin_config_wernis.tpl
templates/de/html/admin/admin_config_yoomedia.tpl
templates/de/html/admin/admin_contct_user_form.tpl
templates/de/html/admin/admin_del_bank_packages.tpl
templates/de/html/admin/admin_delete_admin_menu.tpl
templates/de/html/admin/admin_delete_admins.tpl
templates/de/html/admin/admin_delete_admins_acls.tpl
templates/de/html/admin/admin_delete_cats.tpl
templates/de/html/admin/admin_delete_email_max_rec.tpl
templates/de/html/admin/admin_delete_extensions.tpl
templates/de/html/admin/admin_delete_forced_ads.tpl
templates/de/html/admin/admin_delete_forced_costs.tpl
templates/de/html/admin/admin_delete_guest_menu.tpl
templates/de/html/admin/admin_delete_member_menu.tpl
templates/de/html/admin/admin_delete_network_array_translation.tpl
templates/de/html/admin/admin_delete_network_request_params.tpl
templates/de/html/admin/admin_delete_network_types.tpl
templates/de/html/admin/admin_delete_networks.tpl
templates/de/html/admin/admin_delete_payments.tpl
templates/de/html/admin/admin_delete_payouts.tpl
templates/de/html/admin/admin_delete_rallye_prices.tpl
templates/de/html/admin/admin_delete_rallyes.tpl
templates/de/html/admin/admin_delete_reflevel.tpl
templates/de/html/admin/admin_delete_sponsor.tpl
templates/de/html/admin/admin_delete_surfbar_urls.tpl
templates/de/html/admin/admin_delete_user.tpl
templates/de/html/admin/admin_delete_user_subids.tpl
templates/de/html/admin/admin_edit_admin_menu.tpl
templates/de/html/admin/admin_edit_admin_menu_form.tpl
templates/de/html/admin/admin_edit_admins.tpl
templates/de/html/admin/admin_edit_admins_acls.tpl
templates/de/html/admin/admin_edit_bank_packages.tpl
templates/de/html/admin/admin_edit_bonus_email.tpl
templates/de/html/admin/admin_edit_cats.tpl
templates/de/html/admin/admin_edit_config_network_type_form.tpl
templates/de/html/admin/admin_edit_email.tpl
templates/de/html/admin/admin_edit_email_max_rec.tpl
templates/de/html/admin/admin_edit_email_select.tpl
templates/de/html/admin/admin_edit_extensions.tpl
templates/de/html/admin/admin_edit_forced_ads.tpl
templates/de/html/admin/admin_edit_forced_campaigns.tpl
templates/de/html/admin/admin_edit_forced_costs.tpl
templates/de/html/admin/admin_edit_guest_menu.tpl
templates/de/html/admin/admin_edit_guest_menu_form.tpl
templates/de/html/admin/admin_edit_member_menu.tpl
templates/de/html/admin/admin_edit_mods.tpl
templates/de/html/admin/admin_edit_network_array_translation.tpl
templates/de/html/admin/admin_edit_network_request_params.tpl
templates/de/html/admin/admin_edit_network_types.tpl
templates/de/html/admin/admin_edit_networks.tpl
templates/de/html/admin/admin_edit_payments.tpl
templates/de/html/admin/admin_edit_payouts.tpl
templates/de/html/admin/admin_edit_points_data.tpl
templates/de/html/admin/admin_edit_rallye_prices.tpl
templates/de/html/admin/admin_edit_rallyes.tpl
templates/de/html/admin/admin_edit_refbanner.tpl
templates/de/html/admin/admin_edit_reflevel.tpl
templates/de/html/admin/admin_edit_sponsor_add_points.tpl
templates/de/html/admin/admin_edit_sponsor_edit.tpl
templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
templates/de/html/admin/admin_edit_surfbar_actions.tpl
templates/de/html/admin/admin_edit_surfbar_urls.tpl
templates/de/html/admin/admin_edit_theme.tpl
templates/de/html/admin/admin_edit_user.tpl
templates/de/html/admin/admin_edit_user_subids.tpl
templates/de/html/admin/admin_expert_settings_form.tpl
templates/de/html/admin/admin_extension_reg_form.tpl
templates/de/html/admin/admin_form_selection_box.tpl
templates/de/html/admin/admin_guest_menu_status.tpl
templates/de/html/admin/admin_import_theme_form.tpl
templates/de/html/admin/admin_list_admins.tpl
templates/de/html/admin/admin_list_admins_acls.tpl
templates/de/html/admin/admin_list_bank_package.tpl
templates/de/html/admin/admin_list_beg_form.tpl
templates/de/html/admin/admin_list_bonus_form.tpl
templates/de/html/admin/admin_list_booking.tpl
templates/de/html/admin/admin_list_cats.tpl
templates/de/html/admin/admin_list_country.tpl
templates/de/html/admin/admin_list_country_form.tpl
templates/de/html/admin/admin_list_email_max_rec.tpl
templates/de/html/admin/admin_list_extensions.tpl
templates/de/html/admin/admin_list_forced_ads.tpl
templates/de/html/admin/admin_list_forced_campaigns.tpl
templates/de/html/admin/admin_list_forced_costs.tpl
templates/de/html/admin/admin_list_holiday.tpl
templates/de/html/admin/admin_list_imprint.tpl
templates/de/html/admin/admin_list_mods.tpl
templates/de/html/admin/admin_list_network_array_translation.tpl
templates/de/html/admin/admin_list_network_data.tpl
templates/de/html/admin/admin_list_network_request_params.tpl
templates/de/html/admin/admin_list_network_types.tpl
templates/de/html/admin/admin_list_network_vcheck_params.tpl
templates/de/html/admin/admin_list_nickname_history.tpl
templates/de/html/admin/admin_list_payments.tpl
templates/de/html/admin/admin_list_payouts.tpl
templates/de/html/admin/admin_list_points_accounts.tpl
templates/de/html/admin/admin_list_rallye_prices_simple.tpl
templates/de/html/admin/admin_list_rallyes.tpl
templates/de/html/admin/admin_list_refbanner.tpl
templates/de/html/admin/admin_list_reflevel.tpl
templates/de/html/admin/admin_list_server_name_log.tpl
templates/de/html/admin/admin_list_sponsor.tpl
templates/de/html/admin/admin_list_sponsor_pay.tpl
templates/de/html/admin/admin_list_sponsor_pay_del.tpl
templates/de/html/admin/admin_list_sponsor_pay_edit.tpl
templates/de/html/admin/admin_list_surfbar_actions.tpl
templates/de/html/admin/admin_list_surfbar_urls.tpl
templates/de/html/admin/admin_list_task.tpl
templates/de/html/admin/admin_list_task_delete.tpl
templates/de/html/admin/admin_list_transfer.tpl
templates/de/html/admin/admin_list_user_subid.tpl
templates/de/html/admin/admin_list_user_subid_stats.tpl
templates/de/html/admin/admin_list_yoomedia_tm_already.tpl
templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
templates/de/html/admin/admin_lock_sponsor.tpl
templates/de/html/admin/admin_lock_surfbar_urls.tpl
templates/de/html/admin/admin_lock_user.tpl
templates/de/html/admin/admin_login_form.tpl
templates/de/html/admin/admin_logout_form.tpl
templates/de/html/admin/admin_maintenance_form.tpl
templates/de/html/admin/admin_member_menu_overview.tpl
templates/de/html/admin/admin_member_menu_status.tpl
templates/de/html/admin/admin_newsletter.tpl
templates/de/html/admin/admin_newsletter_nohtml.tpl
templates/de/html/admin/admin_overview_table.tpl
templates/de/html/admin/admin_payout_accept_form.tpl
templates/de/html/admin/admin_payout_overview_form.tpl
templates/de/html/admin/admin_payout_reject_form.tpl
templates/de/html/admin/admin_reg_form.tpl
templates/de/html/admin/admin_reset_password.tpl
templates/de/html/admin/admin_reset_password_form.tpl
templates/de/html/admin/admin_reset_password_send_link.tpl
templates/de/html/admin/admin_send_bonus_form.tpl
templates/de/html/admin/admin_send_coupon.tpl
templates/de/html/admin/admin_send_yoomedia.tpl
templates/de/html/admin/admin_show_config_network_type.tpl
templates/de/html/admin/admin_sub_points.tpl
templates/de/html/admin/admin_sub_points_all.tpl
templates/de/html/admin/admin_undelete_surfbar_urls.tpl
templates/de/html/admin/admin_unlock_emails.tpl
templates/de/html/admin/admin_unlock_emails_redir.tpl
templates/de/html/admin/admin_unlock_sponsor.tpl
templates/de/html/admin/admin_unlock_surfbar_urls.tpl
templates/de/html/admin/admin_validate_reset_hash_form.tpl
templates/de/html/doubler/doubler_index.tpl
templates/de/html/guest/guest_confirm_link.tpl
templates/de/html/guest/guest_login.tpl
templates/de/html/guest/guest_nickname_login.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/guest/guest_sponsor_activate.tpl
templates/de/html/guest/guest_sponsor_login.tpl
templates/de/html/guest/guest_sponsor_lost.tpl
templates/de/html/guest/guest_sponsor_reg.tpl
templates/de/html/install/install_fatal_errors.tpl
templates/de/html/install/install_finished.tpl
templates/de/html/install/install_page1.tpl
templates/de/html/install/install_page2.tpl
templates/de/html/install/install_page3.tpl
templates/de/html/install/install_page5.tpl
templates/de/html/install/install_selector.tpl
templates/de/html/install/install_welcome.tpl
templates/de/html/js/js_surfbar_member_book.tpl
templates/de/html/js/js_surfbar_stopped.tpl
templates/de/html/mailid/mailid_confirm_buttom.tpl
templates/de/html/mailid/mailid_enter_code.tpl
templates/de/html/mailid/mailid_timer.tpl
templates/de/html/member/member_add_subid.tpl
templates/de/html/member/member_book_surfbar_dynamic.tpl
templates/de/html/member/member_book_surfbar_static.tpl
templates/de/html/member/member_cash_coupon.tpl
templates/de/html/member/member_cats.tpl
templates/de/html/member/member_delete_user_subids.tpl
templates/de/html/member/member_earning_popup_form_row.tpl
templates/de/html/member/member_earning_popup_row.tpl
templates/de/html/member/member_edit_refback.tpl
templates/de/html/member/member_edit_user_subids.tpl
templates/de/html/member/member_holiday_deactivate.tpl
templates/de/html/member/member_holiday_form.tpl
templates/de/html/member/member_html_mail_settings.tpl
templates/de/html/member/member_list_refback_deleted_row.tpl
templates/de/html/member/member_list_refback_row.tpl
templates/de/html/member/member_list_surfbar_form.tpl
templates/de/html/member/member_list_user_subids.tpl
templates/de/html/member/member_mydata_button.tpl
templates/de/html/member/member_mydata_edit.tpl
templates/de/html/member/member_newsletter.tpl
templates/de/html/member/member_nickname_form.tpl
templates/de/html/member/member_order_back.tpl
templates/de/html/member/member_order_page1.tpl
templates/de/html/member/member_order_page2.tpl
templates/de/html/member/member_order_send.tpl
templates/de/html/member/member_order_thanks.tpl
templates/de/html/member/member_payout_form.tpl
templates/de/html/member/member_payout_form_banner.tpl
templates/de/html/member/member_profile_outdated.tpl
templates/de/html/member/member_support_form.tpl
templates/de/html/member/member_surfbar_delete_action_form.tpl
templates/de/html/member/member_surfbar_edit_action_form.tpl
templates/de/html/member/member_themes.tpl
templates/de/html/member/member_transfer_new.tpl
templates/de/html/member/member_transfer_settings.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl
templates/de/html/page_header.tpl
templates/de/html/select/select_admins_box.tpl
templates/de/html/select/select_network_box.tpl
templates/de/html/select/select_network_type_box.tpl
templates/de/html/select/select_network_type_title_box.tpl
templates/de/html/sponsor/sponsor_account_form.tpl
templates/de/html/sponsor/sponsor_fillup_form.tpl
templates/de/html/sponsor/sponsor_settings_form.tpl
templates/de/html/surfbar/surfbar_login_form.tpl
templates/de/html/theme/theme_select_form.tpl
templates/xml/admin/admin_delete_show_forced_ads.xml
templates/xml/admin/admin_delete_show_forced_costs.xml
templates/xml/admin/admin_delete_show_surfbar_urls.xml
templates/xml/admin/admin_delete_show_user_subid.xml
templates/xml/admin/admin_edit_show_forced_ads.xml
templates/xml/admin/admin_edit_show_forced_campaigns.xml
templates/xml/admin/admin_edit_show_forced_costs.xml
templates/xml/admin/admin_edit_show_point_accounts.xml
templates/xml/admin/admin_edit_show_surfbar_actions.xml
templates/xml/admin/admin_edit_show_surfbar_urls.xml
templates/xml/admin/admin_edit_show_user_subid.xml
templates/xml/admin/admin_list_booking.xml
templates/xml/admin/admin_list_user_subid.xml
templates/xml/member/member_delete_show_user_subid.xml
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css
theme/org/css/general.css
theme/schleuder/css/general.css
theme/ship-simu/css/general.css

index 7c1e89e72c808426c145b17491dea82902562a1f..e0baf6e4b2547e0115ced9e3ba9016a2c95325e9 100644 (file)
@@ -14,6 +14,7 @@
 ./inc/expression-functions.php:46:     // @TODO is escapeQuotes() enougth for strings with single/double quotes?
 ./inc/extensions/ext-html_mail.php:136:                // @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-network.php:100:          // @TODO network_type_handler is an internal name and needs documentation
 ./inc/extensions/ext-network.php:18: * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
 ./inc/extensions/ext-network.php:19: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
 ./inc/extensions/ext-network.php:20: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
 ./inc/extensions/ext-network.php:39: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
 ./inc/extensions/ext-network.php:40: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
 ./inc/extensions/ext-network.php:41: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:42: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:99:           // @TODO network_type_handler is an internal name and needs documentation
+./inc/extensions/ext-network.php:42: * @TODO Xijide: Lead/Sale (together) unsupported (no target URL)       *
+./inc/extensions/ext-network.php:43: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
 ./inc/extensions/ext-nickname.php:52:          // @TODO NOT NULL DEFAULT '' is bad practice, use NULL
 ./inc/extensions/ext-rallye.php:94:            // @TODO Fix config_rallye_prices to list_rallye_prices
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
-./inc/extensions-functions.php:2132:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:2119:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
 ./inc/extensions-functions.php:424:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
 ./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:580:            // @TODO Extension is loaded, what next?
 ./inc/filter/cache_filter.php:94:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
 ./inc/filter/forced_filter.php:73:             // @TODO This part is unfinished
 ./inc/filters.php:1313:                        // @TODO No banner found, output some default banner
-./inc/functions.php:1099:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:1185:                      // @TODO Are these convertions still required?
-./inc/functions.php:1206:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:1790:      // @TODO Find a way to cache this
-./inc/functions.php:1895:      // @TODO This is still very static, rewrite it somehow
-./inc/functions.php:2105:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:1102:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:1188:                      // @TODO Are these convertions still required?
+./inc/functions.php:1209:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:1796:      // @TODO Find a way to cache this
+./inc/functions.php:1901:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2108:      // @TODO Rename column data_type to e.g. mail_status
+./inc/functions.php:2458:// @TODO cacheFiles is not yet supported
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/header.php:66:// @TODO Find a way to not use direct module comparison
 ./inc/install-functions.php:91:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
@@ -79,7 +81,7 @@
 ./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/mailid_functions.php:47:            // @TODO Rewrite this to a dynamic include or so
-./inc/libs/network_functions.php:1120: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine
+./inc/libs/network_functions.php:1124: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine
 ./inc/libs/order_functions.php:46:     // @TODO Move this array into a filter
 ./inc/libs/rallye_functions.php:771:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
 ./inc/libs/rallye_functions.php:838:   $EXPIRE = 3; // @TODO The hard-coded value...
@@ -89,9 +91,9 @@
 ./inc/libs/sponsor_functions.php:436:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1692:         // @TODO This can be somehow rewritten
 ./inc/libs/surfbar_functions.php:789:// @TODO Can't we use our new expression language instead of this ugly code?
-./inc/libs/task_functions.php:253:             // @TODO These can be rewritten to filter
+./inc/libs/task_functions.php:256:             // @TODO These can be rewritten to filter
 ./inc/libs/task_functions.php:51:// @TODO Move all extension-dependent queries into filters
-./inc/libs/theme_functions.php:94:     // @TODO Can't this be rewritten to an API function?
+./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);
 ./inc/libs/user_functions.php:354:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 ./inc/libs/yoomedia_functions.php:108: $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script
 ./inc/mails/doubler_mails.php:53:// @TODO Can this be rewritten 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:1043:// @TODO rawUserId/content is not yet supported
+./inc/modules/admin/admin-inc.php:1068:// @TODO rawUserId/cacheFiles/content is not yet supported
 ./inc/modules/admin/admin-inc.php:163:         // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
 ./inc/modules/admin/admin-inc.php:236:         // @TODO This can be rewritten into a filter
 ./inc/modules/admin/admin-inc.php:521:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:868:// @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:289:                              // @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:323:                                              // @TODO This may also be rewritten to include files
 ./inc/mysql-manager.php:1464:  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1770:                  // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1967:                          // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-./inc/mysql-manager.php:2070:                  // @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2079:                  // @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2300:// @TODO cacheFiles is not yet supported
 ./inc/mysql-manager.php:398:   // @TODO Try to rewrite this to one or more functions
 ./inc/mysql-manager.php:44:// @TODO Can we cache this?
 ./inc/purge/purge-inact.php:55:        // @TODO Rewrite these if() blocks to a filter
 ./inc/template-functions.php:288:      // @TODO Remove these sanity checks if all is fine
 ./inc/template-functions.php:625:// @TODO $simple/$constants are deprecated
 ./inc/template-functions.php:723:                      // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates
-./inc/wrapper-functions.php:3037:      // @TODO Find a way to not use direct module comparison
-./inc/wrapper-functions.php:506:// @TODO Do some more sanity check here
-./inc/xml-functions.php:239:   // @TODO Handle characters
+./inc/wrapper-functions.php:3031:      // @TODO Find a way to not use direct module comparison
+./inc/wrapper-functions.php:500:// @TODO Do some more sanity check here
+./inc/xml-functions.php:240:   // @TODO Handle characters
 ./mailid.php:102:              // @TODO Rewrite this to a filter
 ./mailid.php:145:                                      // @TODO Rewrite this to a filter
 ./mailid_top.php:112:          // @TODO Rewrite this to a filter/function
 ./mailid_top.php:199:                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:206:                                                                  // @TODO Rewrite this to a filter
 ./mailid_top.php:241:                                                                  // @TODO Rewrite these blocks to filter
-./templates/de/html/admin/admin_add_country.tpl:23:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
+./templates/de/html/admin/admin_add_country.tpl:24:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
 ./templates/de/html/admin/admin_config_other.tpl:79:                   <!-- @TODO Rewrite this selection to one of our functions //-->
 ./templates/de/html/admin/admin_config_rewrite.tpl:4:  <!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_edit_admin_menu.tpl:4:<!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_config_bonus_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_cache.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_doubler_pro.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_home_settings_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_reg_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_shop.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_transfer_pro.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/guest/guest_confirm_table.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/guest/guest_paidlinks_register_header.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/guest/guest_paidlinks_register.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/install/install_header.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_one.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_select_box.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/theme_select_form.tpl:1:<!-- @DEPRECATED //-->
index 6fb9e3c21d226227e8fa82d031c31ab4bc631822..f0b1a06a2cfbd6663d93155c2a185918b8863b3f 100644 (file)
@@ -56,15 +56,15 @@ $doc->loadHTMLFile($_SERVER['argv'][1]);
 
 $data = $doc->saveHTML();
 $newData = str_replace("<br>", "<br />\n", $data);
-$newData = str_replace("\n\n", chr(10), $newData);
+$newData = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $newData);
 
-$array = explode(chr(10), $newData);
+$array = explode(PHP_EOL, $newData);
 array_shift($array);
 array_shift($array);
 unset($array[count($array) - 1]);
 unset($array[count($array) - 1]);
 
-$newData = implode(chr(10), $array).chr(10);
+$newData = implode(PHP_EOL, $array).PHP_EOL;
 
 // Has a template changed?
 if ($data != $newData) {
index 55616a03685508e7fbbbf87f1b1bbd35e5c5923d..8f5aada84de8ae366c08753432fa58b16e982e50 100644 (file)
@@ -1328,15 +1328,19 @@ function addXmlValueToCallbackAttributes ($element, $attributes, $extraKey = '',
 //-----------------------------------------------------------------------------
 
 // Execute function for doXmlCallbackFunction()
-function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex) {
+function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex, $content) {
        // Is 'id_index' set and form sent?
        if ((isset($args['id_index'])) && (isFormSent())) {
                // Prepare 'id_index'
                $args['id_index'] = postRequestElement($args['id_index']);
        } // END - if
 
+       // Add content
+       $args['_content'] = $content;
+
        // Just call it
-       //* DEBUG: */ die(__FUNCTION__.':callbackFunction=' . $callbackName . ',columnIndex=' . $columnIndex . ',args=<pre>'.print_r($args, TRUE).'</pre>');
+       //* DEBUG: */ die(__FUNCTION__.':callbackFunction=' . $callbackName . ',<br />columnIndex=' . $columnIndex . ',<br />args(' . count($args) . ')=<pre>'.print_r($args, TRUE).'</pre>');
+       //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'Called!');
        call_user_func_array($callbackName, $args);
 }
 
index 095187b53146b4684399f46477c887c3b718b5a6..2408c751bc1e44566ce570aa0878cad380f29a2b 100644 (file)
@@ -138,7 +138,7 @@ class CacheSystem {
                // Is the pointer a valid resource?
                if (is_resource($this->pointer)) {
                        // Write the line
-                       fwrite($this->pointer, $line . chr(10));
+                       fwrite($this->pointer, $line . PHP_EOL);
                } else {
                        // Something bad happened
                        reportBug(__METHOD__, __LINE__, 'Pointer type is ' . gettype($this->pointer) . ', expected is resource.');
index 035f169d7864b68de7f3311fe313314d23ec6eec..cfa68f5ca1d170b81d66de4a7ddf5d21c121cf2f 100644 (file)
@@ -194,7 +194,7 @@ function updateOldConfigFile () {
        copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644);
 
        // First of all, load the old one!
-       $oldConfig = explode(chr(10), readFromFile(getPath() . 'inc/config.php'));
+       $oldConfig = explode(PHP_EOL, readFromFile(getPath() . 'inc/config.php'));
 
        // Now, analyze every entry
        $done = array();
index 7c59f5d1ce7e039e1054bba6652446cc71f6cb98..c798121d321559420e8687bcff91367fe53172aa 100644 (file)
@@ -50,7 +50,7 @@ if (function_exists('date_default_timezone_set')) {
        @date_default_timezone_set('Europe/Berlin');
 } // END - if
 
-// CFG: ERROR_REPORTING
+// CFG: ERROR-REPORTING
 error_reporting(E_ALL | E_DEPRECATED | E_STRICT);
 
 // Is the function there? (removed in PHP 5.4.x)
@@ -101,7 +101,7 @@ setConfigEntry('TITLE', 'Mailer-Project');
 // CFG: COPY
 setConfigEntry('COPY', 'Copyright &copy; 2003 - 2009, by Roland H&auml;der,<br />2009 - 2012 by Mailer Developer Team');
 
-// CFG: CACHE_PATH
+// CFG: CACHE-PATH
 setConfigEntry('CACHE_PATH', 'inc/cache/');
 
 // CFG: INTERNAL-STATS (This setting is overwritten by ext-other equal and prior version 0.2.7)
index 8715bc7b4a796de68afc2fa102a5526dc515936c..4b8c5a299a01bfed117e976008b6c8623256d8c1 100644 (file)
@@ -66,7 +66,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) {
                }
 
                // Remove \t, \n and \r from queries they may confuse some MySQL versions
-               $sqlStringModified = str_replace(array(chr(9), chr(10), chr(13)), array(' ', ' ', ' '), $sqlStringModified);
+               $sqlStringModified = str_replace(array(chr(9), PHP_EOL, chr(13)), array(' ', ' ', ' '), $sqlStringModified);
 
                // Compile config entries out
                $sqlStringModified = SQL_PREPARE_SQL_STRING($sqlStringModified, $enableCodes);
@@ -118,7 +118,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) {
                } // END - if
 
                // Append debug line
-               appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), chr(10)), array('', ' '), $GLOBALS['last_sql']));
+               appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), PHP_EOL), array('', ' '), $GLOBALS['last_sql']));
        } // END - if
 
        // Increment stats entry
index 3693439c41aafae59b8065992d2633f7fcfc4c94..e70d284bd82fe6f1fdf3fb8c622822378d24bde1 100644 (file)
@@ -106,7 +106,7 @@ function doExpressionCode ($data) {
        return $code;
 }
 
-// Expression call-back function for URLs
+// Expression call-back function for URLs (example: {%url=foo.php?bar=bar%})
 function doExpressionUrl ($data) {
        // Is there JS-mode?
        if ($data['callback'] == 'js') {
@@ -426,5 +426,124 @@ function doExpressionSessionPipe ($data) {
        return $code;
 }
 
+// Expression call-back for formulars
+function doExpressionForm ($data) {
+       // Default method is GET, target is _self
+       $data['__form_method'] = 'get';
+       $data['__form_target'] = '_self';
+       $data['__form_name']   = 'form';
+       $data['__form_id']     = 'form';
+       $data['__server']      = '';
+
+       // Check which method/target is set
+       foreach (array('callback', 'extra_func', 'extra_func2') as $key) {
+               // Make lower-case
+               $value = strtolower($data[$key]);
+
+               // Is formMethodPost set?
+               if ($value == 'formmethodpost') {
+                       // Use it
+                       $data['__form_method'] = 'post';
+               } elseif (($value == 'formmethodget') && (!isSpider()) && (!isSessionValid())) {
+                       // Then expand 'value' with session id
+                       if (strpos($data['value'], '?') !== FALSE) {
+                               // '?' is set
+                               $data['value'] .= '&amp';
+                       } else {
+                               // Is not set
+                               $data['value'] .= '?';
+                       }
+
+                       // Append session's name and id
+                       $data['value'] .= session_name() . '=' . session_id();
+               } elseif (substr($value, 0, 10) == 'formtarget') {
+                       // Form target is found
+                       $data['__form_target'] = substr($value, 10);
+               } elseif (substr($value, 0, 8) == 'formname') {
+                       // Form name is found
+                       $data['__form_name'] = substr($value, 8);
+               } elseif (substr($value, 0, 6) == 'formid') {
+                       // Form id found
+                       $data['__form_id'] = substr($value, 6);
+               } elseif (substr($value, 0, 6) == 'server') {
+                       // {%server,foo%} found
+                       $data['__server'] = '{%server=' . substr($value, 6) . '%}';
+               }
+       } // END - foreach
+
+       // Generate the replacement code which is the opening form tag
+       $data['__replacer'] = '<form accept-charset=\"UTF-8\"';
+       if (!empty($data['value'])) {
+               $data['__replacer'] .= ' action=\"{%url=' . $data['value'];
+               if (!empty($data['__server'])) {
+                       $data['__replacer'] .= $data['__server'];
+               } // END - if
+               $data['__replacer'] .= '%}\"';
+       } // END - if
+
+       // Add rest elements
+       foreach (array('method', 'target', 'name', 'id') as $key) {
+               $data['__replacer'] .= ' ' . $key . '=\"' . $data['__form_' . $key] . '\"';
+       } // END - foreach
+
+       // Close the tag here (don't move it below the next filter)
+       $data['__replacer'] .= '>' . PHP_EOL;
+
+       /*
+        * Call a filter chain to allow more hidden fields being added. You should
+        * not remove the > char from above line to add onsubmit="" or so. Instead
+        * you should better use jquery to accomplish the same.
+        */
+       $data = runFilterChain('open_form_fields', $data);
+
+       // Replace the code
+       $code = replaceExpressionCode($data, $data['__replacer']);
+
+       // Return the (maybe) replaced code
+       return $code;
+}
+
+// Expression call-back to close form tags
+function doExpressionFormClose ($data) {
+       // Initial replacer is really easy ...
+       $data['__replacer'] = '</form>' . PHP_EOL;
+
+       /*
+        * Call a filter chain to allow more hidden fields being added at the end
+        * of the form.
+        */
+       $data = runFilterChain('close_form_fields', $data);
+
+       // Replace the code
+       $code = replaceExpressionCode($data, $data['__replacer']);
+
+       // Return the (maybe) replaced code
+       return $code;
+}
+
+// Expression call-back to handle jquery inclusion
+function doExpressionJquery ($data) {
+       // Default is compressed
+       $jquery = 'jquery.js';
+
+       // Is debug mode enabled?
+       if ((isGetRequestElementSet('jquery')) || (isSessionVariableSet('jquery'))) {
+               // Then use uncompressed
+               $jquery = 'jquery-uncompressed.js';
+
+               // Remember it in session
+               setSession('jquery', '1');
+       } // END - if
+
+       // Add {%url%} around it
+       $replacer = '{%url=js/' . $jquery . '?dummy=1%}';
+
+       // Replace the code
+       $code = replaceExpressionCode($data, $replacer);
+
+       // Return the (maybe) replaced code
+       return $code;
+}
+
 // [EOF]
 ?>
index 12a9b437ad70693695ef5118874a57025765dd32..29634ca48bb668c41d86373a57786fa1dcb7456f 100644 (file)
@@ -153,7 +153,7 @@ switch (getExtensionMode()) {
                //
                $GLOBALS['url_ends'] = array(
                        ' ',
-                       chr(10),
+                       PHP_EOL,
                        chr(13),
                        ')',
                );
index 0866599256730790faefcf4be67539fb7b3b0f15..fcbbb39b7dc87254cbd06fd24aff8ca2c5295ab7 100644 (file)
@@ -39,6 +39,7 @@
  * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
  * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
  * @TODO Der Werbepartner.cc: Textlink not not correct                  *
+ * @TODO Xijide: Lead/Sale (together) unsupported (no target URL)       *
  * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
@@ -277,6 +278,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
 ('popdown_id'),
 ('lead_id'),
 ('sale_id'),
+('lead_sale_id'),
 ('banner_url1'),
 ('banner_url2'),
 ('banner_url3'),
@@ -343,7 +345,8 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
 ('ads2earn', 'Ads2Earn', 'http://www.ads2earn.de?ref=1294', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
 ('ads2webbi', 'Ads2Webbi', 'http://www.ads2webbi.de?ref=79', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
 ('superpromo24', 'SuperPromo24', 'http://www.superpromo24.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 300, 'Y'),
-('euads', 'eu-ADS.de', 'http://www.eu-ads.de?ref=411', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y')");
+('euads', 'eu-ADS.de', 'http://www.eu-ads.de?ref=411', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y'),
+('xiji', 'Xiji.de', 'http://www.xiji.de/index.php?ref=7715', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y')");
 
                // Network type handlers - A3H
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`) VALUES
@@ -904,6 +907,20 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
 (154, 22, 'forcedtextlink', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL, 'h'),
 (155, 22, 'traffic', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/get.php', NULL, 'h')");
 
+               // Network type handlers - Xiji.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`, `network_text_encoding`) VALUES
+(450, 43, 'textmail', 'http://www.xiji.de/interface/output_paidmails.php', 'http://www.xiji.de/view/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(451, 43, 'banner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'),
+(452, 43, 'forcedbanner', 'http://www.xiji.de/interface/output_forcedbanner.php', 'http://www.xiji.de/view/forcedclickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/forcedviewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'),
+(453, 43, 'popup', 'http://www.xiji.de/interface/output_popup.php', 'http://www.xiji.de/view/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(454, 43, 'layer_view', 'http://www.xiji.de/interface/output_layerviews.php', 'http://www.xiji.de/view/layer.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(455, 43, 'forcedtextlink', 'http://www.xiji.de/interface/output_forcedtextlink.php', 'http://www.xiji.de/view/forcedclicktextlink.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(456, 43, 'traffic', 'http://www.xiji.de/interface/output_traffic.php', 'http://www.xiji.de/view/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(457, 43, 'popdown', 'http://www.xiji.de/interface/output_popdown.php', 'http://www.xiji.de/view/popdown.php?id=%UID%&bid=%CID%&aid=%SID%', NULL,'h','NONE'),
+(458, 43, 'button_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'),
+(459, 43, 'skybanner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE'),
+(460, 43, 'halfbanner_view', 'http://www.xiji.de/interface/output_viewbanner.php', 'http://www.xiji.de/view/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.xiji.de/view/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%','h','NONE')");
+
                // Network type handlers - Yoo!Media
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handler`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`, `network_type_reload_time_unit`) VALUES
 (156, 23, 'banner_click', 'http://www.yoomedia.de/interface_2.0/out_banner.php', 'http://www.yoomedia.de/code/z-bannerklf.php?id=%CID%&sid=%SID%', 'http://www.yoomedia.de/code/z-banner.php?id=%CID%&sid=%SID%&bid=%BID%', 'h'),
@@ -4076,6 +4093,39 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
 (22, 155, 'reward', 'verg', NULL),
 (22, 155, 'sid', 'sid', NULL)");
 
+               // Request parameters per type handler - Xiji.de
+
+               // Request parameters per type handler - Xiji.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES
+(43, 451, 'affiliate_id', 'id', NULL),
+(43, 451, 'password', 'pw', NULL),
+(43, 451, 'reload', 'reload', NULL),
+(43, 451, 'reward', 'verguetung', NULL),
+(43, 451, 'remain', 'uebrig', NULL),
+(43, 451, 'size', 'typ', '468x60'),
+(43, 451, 'sid', 'aid', NULL),
+(43, 458, 'affiliate_id', 'id', NULL),
+(43, 458, 'password', 'pw', NULL),
+(43, 458, 'reload', 'reload', NULL),
+(43, 458, 'reward', 'verguetung', NULL),
+(43, 458, 'remain', 'uebrig', NULL),
+(43, 458, 'size', 'typ', '88x31'),
+(43, 458, 'sid', 'aid', NULL),
+(43, 459, 'affiliate_id', 'id', NULL),
+(43, 459, 'password', 'pw', NULL),
+(43, 459, 'reload', 'reload', NULL),
+(43, 459, 'reward', 'verguetung', NULL),
+(43, 459, 'remain', 'uebrig', NULL),
+(43, 459, 'size', 'typ', '120x600'),
+(43, 459, 'sid', 'aid', NULL),
+(43, 460, 'affiliate_id', 'id', NULL),
+(43, 460, 'password', 'pw', NULL),
+(43, 460, 'reload', 'reload', NULL),
+(43, 460, 'reward', 'verguetung', NULL),
+(43, 460, 'remain', 'uebrig', NULL),
+(43, 460, 'size', 'typ', '234x60'),
+(43, 460, 'sid', 'aid', NULL)");
+
                // Request parameters per type handler - Yoo!Media
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `network_request_param_key`, `network_request_param_value`, `network_request_param_default`) VALUES
 (23, 156, 'erotic', 'erotik', NULL),
@@ -7281,6 +7331,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
                addDropTableSql('network_types');
                addDropTableSql('network_request_params');
                addDropTableSql('network_vcheck_params');
+               addDropTableSql('network_vcheck_errors');
                addDropTableSql('network_error_codes');
                addDropTableSql('network_array_translation');
                addDropTableSql('network_api_config');
@@ -7288,6 +7339,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)",
                addDropTableSql('network_vcheck_config');
                addDropTableSql('network_cache');
                addDropTableSql('network_reloads');
+               addDropTableSql('network_translations');
 
                // Admin menu
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='network'");
index d4efcfaaf40b54d799f0b0821566462cddd18cc1..60d49f39f51ef70d1f7dff8f9030825746735d7f 100644 (file)
@@ -218,7 +218,7 @@ INDEX `topic` (`nl_topic_id`)",
                // @TODO Move these into configuration
                $GLOBALS['url_ends'] = array(
                        ' ',
-                       chr(10),
+                       PHP_EOL,
                        chr(13),
                        ')',
                );
index 8a11ac1067ff705a7b10e08f3977a0474b695407..c75f48417eda2ff8170a372b6b188a324921d019 100644 (file)
@@ -206,6 +206,9 @@ ORDER BY
        // Handle referral banner click/view
        registerFilter(__FUNCTION__, __LINE__, 'handle_click_php', 'HANDLE_REFERRER_BANNER_CLICK');
        registerFilter(__FUNCTION__, __LINE__, 'handle_view_php', 'HANDLE_REFERRER_BANNER_VIEW');
+
+       // Generic filter to add hidden fields to formulars
+       registerFilter(__FUNCTION__, __LINE__, 'open_form_fields', 'ADD_INPUT_HIDDEN_SESSION_ID');
 }
 
 // "Registers" a new filter function
index 31c22ee1174f3a28db856ef4b8f07ed8d70eda17..26dd41df983dddcd6fb8d7e7bf487863113ccf2b 100644 (file)
@@ -51,7 +51,7 @@ function FILTER_UPDATE_ONLINE_LIST ($filterData) {
        } // END - if
 
        // Empty session?
-       if (session_id() == '') {
+       if (!isSessionValid()) {
                // This is invalid here!
                reportBug(__FUNCTION__, __LINE__, 'Invalid session.');
        } // END - if
index 83019226a20f89bd1b43270e53398637cfb2e0a8..4852a2c12d1e68e3caeed594f767019a07c352cf 100644 (file)
@@ -557,7 +557,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
                                $filterData = call_user_func($etiFunction, $data);
                        } else {
                                // Unsupported command detected
-                               logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ', callback=' . $callback . ', extra=' . $extraFunction . ' - unsupported');
+                               logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ',etiFunction=' . $etiFunction . ',callback=' . $callback . ',extraFunction=' . $extraFunction . ',extraFunction2=' . $extraFunction2 . ' - UNSUPPORTED');
                        }
                } // END - foreach
        } // END - if
@@ -1340,5 +1340,17 @@ function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) {
        return $filterData;
 }
 
+// Filter for adding hidden session id
+function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) {
+       // Is a spider detected?
+       if ((!isSpider()) && (!isSessionValid())) {
+               // No, then add the hidden field
+               $filterData['__replacer'] .= '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
+       } // END - if
+
+       // Return filter data
+       return $filterData;
+}
+
 // [EOF]
 ?>
index c72f7eb7f65de7009edeb2cfd41a98b544e8eb43..5fae9029ade664d4af5dfd37be0eec38f98d5d70 100644 (file)
@@ -1245,7 +1245,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0
                                        if ($next > -1) {
                                                if ($next === $seek) {
                                                        $next = -1;
-                                                       $line = $prefix . $inserted . $suffix . chr(10);
+                                                       $line = $prefix . $inserted . $suffix . PHP_EOL;
                                                } else {
                                                        $next++;
                                                }
@@ -1289,7 +1289,7 @@ function logDebugMessage ($funcFile, $line, $message, $force=true) {
        // Is debug mode enabled?
        if ((isDebugModeEnabled()) || ($force === TRUE)) {
                // Remove CRLF
-               $message = str_replace(array(chr(13), chr(10)), array('', ''), $message);
+               $message = str_replace(array(chr(13), PHP_EOL), array('', ''), $message);
 
                // Log this message away
                appendLineToFile(getPath() . getCachePath() . 'debug.log', generateDateTime(time(), '4') . '|' . getModule(FALSE) . '|' . basename($funcFile) . '|' . $line . '|' . $message);
@@ -1344,8 +1344,11 @@ function handleExtraValues ($filterFunction, $value, $extraValue) {
 
 // Tries to determine if call-back functions and/or extra values shall be parsed
 function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search) {
-       // Debug message
-       /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE));
+       // Debug mode enabled?
+       if (isDebugModeEnabled()) {
+               // Debug message
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries=' . $entries . ',userIdColumn=' . $userIdColumn[0] . ',search=' . $search . ',filterFunctions=' . print_r($filterFunctions, TRUE) . ',extraValues=' . print_r($extraValues, TRUE));
+       } // END - if
 
        // Send data through the filter function if found
        if ($key == $userIdColumn[0]) {
@@ -1925,7 +1928,7 @@ function encodeUrl ($url, $outputMode = '0') {
        } // END - if
 
        // Is there a valid session?
-       if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === FALSE) || (!isset($_COOKIE[session_name()]))) && (isSpider() === FALSE)) {
+       if ((!isSessionValid()) && (!isSpider())) {
                // Determine right separator
                $separator = '&amp;';
                if (!isInString('?', $url)) {
@@ -1933,11 +1936,8 @@ function encodeUrl ($url, $outputMode = '0') {
                        $separator = '?';
                } // END - if
 
-               // Is the session id set?
-               if (session_id() != '') {
-                       // Then add it to URL
-                       $url .= $separator . session_name() . '=' . session_id();
-               } // END - if
+               // Then add it to URL
+               $url .= $separator . session_name() . '=' . session_id();
        } // END - if
 
        // Add {?URL?} ?
@@ -2181,7 +2181,7 @@ function isHexadecimal ($hex) {
 }
 
 /**
- * Replace chr(13) with "[r]" and chr(10) with "[n]" and add a final new-line to make
+ * Replace chr(13) with "[r]" and PHP_EOL with "[n]" and add a final new-line to make
  * them visible to the developer. Use this function to debug e.g. buggy HTTP
  * response handler functions.
  *
@@ -2189,7 +2189,7 @@ function isHexadecimal ($hex) {
  * @return     $str    Overworked string
  */
 function replaceReturnNewLine ($str) {
-       return str_replace(array(chr(13), chr(10)), array('[r]', '[n]'), $str);
+       return str_replace(array(chr(13), PHP_EOL), array('[r]', '[n]'), $str);
 }
 
 // Converts a given string by splitting it up with given delimiter similar to
@@ -2374,7 +2374,7 @@ function memberAddEntries ($tableName, $columns = array(), $filterFunctions = ar
 }
 
 // Edit rows by given id numbers
-function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
@@ -2408,12 +2408,12 @@ function memberEditEntriesConfirm ($tableName, $columns = array(), $filterFuncti
                }
        } else {
                // List for editing
-               memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               memberListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
        }
 }
 
 // Delete rows by given id numbers
-function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
        // Do this only for members
        assert(isMember());
 
@@ -2450,17 +2450,18 @@ function memberDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunc
                }
        } else {
                // List for deletion confirmation
-               memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               memberListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUSerId, $content);
        }
 }
 
 // Build a special template list
-function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function memberListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
        // Do this only for logged in member
        assert(isMember());
 
        // Call inner (general) function
-       doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId);
+       doGenericListBuilder('member', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 }
 
 // Checks whether given address is IPv4
index cf8377038873faf9436660cbb5b31a253517548d..67a70435983f725096b859e352b7750c8fbbdb88 100644 (file)
@@ -551,7 +551,7 @@ function unchunkHttpResponse ($response) {
                //* DEBUG: */ die('tempResponse['.strlen($tempResponse).']=<pre>'.replaceReturnNewLine(htmlentities($tempResponse)).'</pre>');
 
                // Re-add the headers
-               $response = merge_array($GLOBALS['http_headers'], stringToArray(chr(10), $tempResponse));
+               $response = merge_array($GLOBALS['http_headers'], stringToArray(PHP_EOL, $tempResponse));
        } // END - if
 
        // Return the unchunked array
index 0b5152c99c0c3fb34eaa878900c606a203dd2379..fe21fae75537ecfadb136cb6b126cedd44e820d2 100644 (file)
@@ -149,7 +149,7 @@ function readSqlDump ($FQFN) {
 
        // Remove some unwanted chars
        $content = str_replace(chr(13), '', $content);
-       $content = str_replace("\n\n", chr(10), $content);
+       $content = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $content);
 
        // Return the content
        return $content;
index be9915b3800d39ed19fcf5aa64cfc3b95c959869..be1698f226e9d1349b937ca481da8280c274f07e 100644 (file)
@@ -161,37 +161,41 @@ addMessages(array(
        'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LIMITED_TO_TYPE' => "Es wurden nur die Array-Element-&Uuml;bersetzungen des ausgew&auml;hlten Werbeart-Handlers angezeigt.",
        // - Advertise types
        'ADMIN_NETWORK_TYPE_HANDLER_BANNER' => "Banner Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_CLICK' => "Banner-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_VIEW' => "Banner-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_CLICK' => "Banner Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_BANNER_VIEW' => "Banner View",
        'ADMIN_NETWORK_TYPE_HANDLER_BUTTON' => "Button Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_CLICK' => "Button-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_VIEW' => "Button-View",
-       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR' => "Surfbar Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_CLICK' => "Surfbar-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_VIEW' => "Surfbar-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_CLICK' => "Button Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_BUTTON_VIEW' => "Button View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR' => "Surfbar Klick/View", // This is a software surfbar outside the browser window (mostly Windows-only)
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_CLICK' => "Surfbar Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_SURFBAR_VIEW' => "Surfbar View",
        'ADMIN_NETWORK_TYPE_HANDLER_FORCEDBANNER' => "Forced-Banner",
        'ADMIN_NETWORK_TYPE_HANDLER_FORCEDTEXTLINK' => "Forced-Textlink",
        'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK' => "Textlink Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_CLICK' => "Textlink-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_VIEW' => "Textlink-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_CLICK' => "Textlink Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_TEXTLINK_VIEW' => "Textlink View",
        'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER' => "Sky Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_CLICK' => "Sky-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_VIEW' => "Sky-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_CLICK' => "Sky Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_SKYBANNER_VIEW' => "Sky View",
+       'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER' => "Half-Banner Klick/View",
+       'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER_CLICK' => "Half-Banner Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_HALFBANNER_VIEW' => "Half-Banner View",
        'ADMIN_NETWORK_TYPE_HANDLER_LAYER' => "Layer Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_CLICK' => "Layer-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_VIEW' => "Layer-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_CLICK' => "Layer Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_LAYER_VIEW' => "Layer View",
        'ADMIN_NETWORK_TYPE_HANDLER_POPUP' => "PopUp",
        'ADMIN_NETWORK_TYPE_HANDLER_POPDOWN' => "PopDown",
        'ADMIN_NETWORK_TYPE_HANDLER_TEXTMAIL' => "Textmail",
        'ADMIN_NETWORK_TYPE_HANDLER_HTMLMAIL' => "HTML-Mail",
        'ADMIN_NETWORK_TYPE_HANDLER_LEAD' => "Lead",
        'ADMIN_NETWORK_TYPE_HANDLER_SALE' => "Sale",
+       'ADMIN_NETWORK_TYPE_HANDLER_LEAD_SALE' => "Lead/Sale",
        'ADMIN_NETWORK_TYPE_HANDLER_PAYPERACTIVE' => "PayPerAktiv",
        'ADMIN_NETWORK_TYPE_HANDLER_PAGEPEEL' => "Page-Peel",
        'ADMIN_NETWORK_TYPE_HANDLER_TRAFFIC' => "Traffic", // These are visitor exchanges like ext-surfbar!
        'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE' => "Signatur Klick/View",
-       'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_CLICK' => "Signatur-Klick",
-       'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_VIEW' => "Signatur-View",
+       'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_CLICK' => "Signatur Klick",
+       'ADMIN_NETWORK_TYPE_HANDLER_SIGNATURE_VIEW' => "Signatur View",
        // - Sponsor networks
        'ADMIN_LIST_NEWORK_DATA_TITLE' => "Auflistung der Grunddaten aller Werbenetzwerke",
        'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.",
@@ -328,6 +332,7 @@ addMessages(array(
        'ADMIN_NETWORK_TRANSLATE_POPDOWN_ID_NAME' => "PopDown-Id",
        'ADMIN_NETWORK_TRANSLATE_LEAD_ID_NAME' => "Lead-Id",
        'ADMIN_NETWORK_TRANSLATE_SALE_ID_NAME' => "Sale-Id",
+       'ADMIN_NETWORK_TRANSLATE_LEAD_SALE_ID_NAME' => "Lead/Sale-Id",
        'ADMIN_NETWORK_TRANSLATE_TRAFFIC_ID_NAME' => "Traffic-Id",
        'ADMIN_NETWORK_TRANSLATE_CAMPAIGN_ID_NAME' => "Kampagnen-Id",
        'ADMIN_NETWORK_TRANSLATE_MINIMUM_STAY_NAME' => "Mindestauffenthalt",
index 5f725ef053ed3b4afeef75585ce0b85e36a9b319..256c8241debb4b3faa0d7f8d18c278d4ecfd9187 100644 (file)
@@ -49,7 +49,7 @@ addMessages(array(
        'ADMIN_CONFIG_NICKNAME_CHARACTERS' => "Zeichenfolge f&uuml;r Sprachdatei",
 
        // Admin - nickname history
-       'ADMIN_LIST_NICKNAME_HISTORY_404' => "Das ausgew&auml;hlte Mitglied <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Eintr&auml;ge gefunden werden.",
+       'ADMIN_LIST_NICKNAME_HISTORY_404' => "Das ausgew&auml;hlte Mitglied <span class=\"data\">{%get,generateUserProfileLink=userid%}</span> hat noch keinen Nicknamen angelegt. Daher konnten auch keine Historie-Eintr&auml;ge gefunden werden.",
        'ADMIN_LIST_NICKNAME_HISTORY_TITLE' => "Alle verwendeten Nicknames des Mitgliedes <span class=\"data\">{%get,generateUserProfileLink=userid%}</span>",
 
        // Member
index 45ee3bea84bf628f654bdb3533fd6ce8ab204564..ce5a8b9682d23b1fd2d2147c2f72166c69382d51 100644 (file)
@@ -277,8 +277,10 @@ addMessages(array(
        'GUEST_SURFBAR_LOGIN_HEADER' => "Login zur Surfbar:",
 
        // Points accounts - subject
-       'POINTS_SUBJECT_SURFBAR'         => "Verg&uuml;tung im Besuchertausch",
-       'POINTS_SUBJECT_MONTHLY_SURFBAR' => "Monatl. Reset (Besuchertausch)",
+       'POINTS_SUBJECT_SURFBAR'             => "Verg&uuml;tung im Besuchert.",
+       'POINTS_SUBJECT_SURFBAR_REF'         => "Anteilige Verg&uuml;tung im Besuchert.",
+       'POINTS_SUBJECT_MONTHLY_SURFBAR'     => "Monatl. Reset (Besuchert.)",
+       'POINTS_SUBJECT_MONTHLY_SURFBAR_REF' => "Anteilige monatl. Reset (Besuchert.)",
 
        // Module title
        'MODULE_SURFBAR_TITLE' => "Besuchertausch",
index 31cfefdd208bdf51e65d16d9a0b08b08e857bc15..beac76adc46fb8ca33bfba07566cf27db22dba00 100644 (file)
@@ -574,7 +574,7 @@ function sendAdminsEmails ($subject, $template, $content, $userid) {
        // Is the template a bug report?
        if ($template == 'admin_report_bug') {
                // Then set 'Reply-To:' again
-               $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+               $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
        } // END - if
 
        // Load email addresses and send away
index 11ea6194cbb54d78dcf4548e4dae12951d039a3f..40f9e68cbe3b5ca2c10de8b5a320063297b27d7b 100644 (file)
@@ -90,7 +90,7 @@ LIMIT 1",
                        sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
-                       $admin .= $content['userid'].chr(10);
+                       $admin .= $content['userid'] . PHP_EOL;
                } // END - if
 
                // Send mail to admins
index 62c13a1a9bb0409721159789f0e129c2850a2f84..be00219d6c76e24ca9e6b56181ce2a215b8416b1 100644 (file)
@@ -148,7 +148,7 @@ function insertUrlsIntoHtml ($text) {
        } // END - foreach
 
        // Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
-       return preCompileCode(str_replace(chr(10), "<br />\n", $text));
+       return preCompileCode(str_replace(PHP_EOL, "<br />" . PHP_EOL, $text));
 }
 
 // [EOF]
index 2a52309768c51b950fef9e855b15ce58e1e3fa72..735b1a53355d6e3e1b5bae80c70c1f00d42c2a1a 100644 (file)
@@ -743,6 +743,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'skybanner',
                                'skybanner_click',
                                'skybanner_view',
+                               'halfbanner',
+                               'halfbanner_click',
+                               'halfbanner_view',
                                'layer',
                                'layer_click',
                                'layer_view',
@@ -752,6 +755,7 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'htmlmail',
                                'lead',
                                'sale',
+                               'lead_sale',
                                'payperactive',
                                'pagepeel',
                                'traffic',
@@ -1132,11 +1136,7 @@ function doAdminNetworkProcessAddNetwork () {
                // Already there
                loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
                return FALSE;
-       } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) {
-               // Network is not active
-               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}');
-               return FALSE;
-       }
+       } // END - if
 
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
@@ -1179,8 +1179,13 @@ function doAdminNetworkProcessHandleNetworks () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Init array with generic element
+                       $content = array(
+                               'rows' => $OUT
+                       );
+
                        // Output main template
-                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $OUT);
+                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $content);
 
                        // Don't display the list/add new form
                        $GLOBALS['network_display'] = FALSE;
@@ -1224,11 +1229,17 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_types', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_types', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_types', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_types', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1282,11 +1293,17 @@ function doAdminNetworkProcessHandleRequestParams () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_request_params', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_request_params', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_request_params', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_request_params', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1802,11 +1819,17 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_array_translation', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_array_translation', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_array_translation', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_array_translation', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
index 11bb77c79036733fc82f1f22c378dd593a5709b1..25687437bbe52f46c72c940dddb314e247ee224d 100644 (file)
@@ -174,7 +174,7 @@ WHERE
 function addReferralRallyePrices ($rallye, $mode = 'email') {
        // Output mode
        switch($mode) {
-               case 'email': $mode = chr(10);  break;
+               case 'email': $mode = PHP_EOL;  break;
                case 'html' : $mode = '<br />'; break;
        } // END - switch
 
@@ -195,7 +195,7 @@ ORDER BY
        if (!SQL_HASZERONUMS($result_prices)) {
                // Load prices
                $prices = '';
-               if ($mode == chr(10)) {
+               if ($mode == PHP_EOL) {
                        $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode;
                } // END - if
 
@@ -217,7 +217,7 @@ ORDER BY
        }
 
        // Add last line for email mode
-       if ($mode == chr(10)) {
+       if ($mode == PHP_EOL) {
                $prices .= '------------------------------';
        } // END - if
 
index f0f80826552182feb1a862e7081d590f7ba60bab..b1243ce216ca3653d9701a2ff569eb9b8cb68832 100644 (file)
@@ -247,21 +247,20 @@ function outputAdvancedOverview (&$result_main) {
        // Both extensions must be there
        if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
                // Start finding them...
-               $EXCLUDE_LIST = ' ';
+               $userExclusionSql = ' ';
+
+               // Exclude test accounts
+               $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
 
                // Check for more extensions
                // @TODO These can be rewritten to filter
-               if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
-               if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}';
-               if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}';
-               if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}';
+               if (isValidUserId(getDefRefid()))              $userExclusionSql .= ' AND d.`userid` != {?def_refid?}';
+               if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND d.`userid` != {?beg_userid?}';
+               if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND d.`userid` != {?bonus_userid?}';
+               if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND d.`userid` != {?doubler_userid?}';
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
-                       $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
-               } // END - if
-               if (isExtensionInstalledAndNewer('user', '0.5.0')) {
-                       // Exclude test accounts
-                       $EXCLUDE_LIST = runFilterChain('user_exclusion_sql', $EXCLUDE_LIST);
+                       $userExclusionSql .= " AND d.`holiday_active`='N'";
                } // END - if
 
                // Check for all accounts
@@ -270,14 +269,13 @@ function outputAdvancedOverview (&$result_main) {
        d.`email`,
        d.`last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-       d.`status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       d.`status`='CONFIRMED' AND
        (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
-".$EXCLUDE_LIST."
+" . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC");
                $WHATs[]  = 'list_autopurge';
index 1a8e05bba28b6aa0656cfaa46313db2c1d1c577d..3fce3a96380080246df22b4281bbd66d98f6ef15 100644 (file)
@@ -47,9 +47,8 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = '{%url=modules.php?module='. $mod;
+       $formAction = 'modules.php?module='. $mod;
        if (!empty($what)) $formAction .= '&amp;what=' . $what;
-       $formAction .= '%}';
 
        // Initialize array
        $themesArray = array(
@@ -61,7 +60,10 @@ function generateThemeSelectionBox () {
        $add = " WHERE `theme_active`='Y'";
 
        // Is there admin?
-       if (isAdmin()) $add = '';
+       if (isAdmin()) {
+               // Then display all themes
+               $add = '';
+       } // END - if
 
        // Select all themes we want
        $result = SQL_QUERY('SELECT
@@ -74,16 +76,16 @@ ORDER BY
        `theme_name` ASC', __FUNCTION__, __LINE__);
 
        // Load all themes
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($row = SQL_FETCHARRAY($result)) {
                // Construct relative include file name
-               $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path']));
+               $inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
 
                // Load it's theme.php file if found
                if (isIncludeReadable($inc)) {
                        // And save all data in array
                        loadInclude($inc);
-                       array_push($themesArray['theme_unix'], $content['theme_path']);
-                       array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name']);
+                       array_push($themesArray['theme_unix'], $row['theme_path']);
+                       array_push($themesArray['theme_name'], $row['theme_name']);
                } // END - if
        } // END - while
 
@@ -105,8 +107,11 @@ ORDER BY
                'selection'   => $OUT
        );
 
+       // Load template
+       $out = loadTemplate('theme_select_form', TRUE, $content);
+
        // Return generated selection
-       return loadTemplate('theme_select_form', TRUE, $content);
+       return $out;
 }
 
 // Get version from name
index 213b7fab04e99d8e043d950e5faca774a062fee2..d55ba8ddc398ea38bc2781be966af813c0866a0b 100644 (file)
@@ -165,7 +165,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        } // END - if
 
        // The result is now still raw, so we must split it up and trim spaces away
-       $responseLine = trim(implode(chr(10), $dummy));
+       $responseLine = trim(implode(PHP_EOL, $dummy));
 
        // Last line should never be a pipe!
        if (substr($responseLine, -1, 1) == '|') {
@@ -414,11 +414,11 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                        $code = $codeArray[0];
 
                        // Remove all new-line characters
-                       $codeArray = explode(chr(10), $code);
+                       $codeArray = explode(PHP_EOL, $code);
                        $code = $codeArray[0];
 
                        // Remove carrige-return
-                       $code = trim(str_replace(chr(10), '', $code));
+                       $code = trim(str_replace(PHP_EOL, '', $code));
 
                        // Is it still empty?
                        if (empty($code)) {
index 75e43f401dfe1f14e873d82b0fcf4d931fe078fc..a9f9405431c756b8150719cd0ad679a7f5aca739 100644 (file)
@@ -64,7 +64,7 @@ if (!isAdminRegistered()) {
                $hashedPass = md5(postRequestElement('admin_pass1'));
 
                // Kill maybe existing session variables
-               destroyAdminSession(FALSE);
+               destroyAdminSession();
 
                // Do registration
                $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
@@ -251,13 +251,13 @@ if (!isAdminRegistered()) {
                        case '404': // Administrator login not found
                                setPostRequestElement('login', $ret);
                                $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}';
-                               destroyAdminSession();
+                               destroyAdminSession(TRUE);
                                break;
 
                        case 'password': // Wrong password
                                setPostRequestElement('login', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
-                               destroyAdminSession();
+                               destroyAdminSession(TRUE);
                                break;
 
                        default: // Others will be logged
@@ -320,7 +320,7 @@ if (!isAdminRegistered()) {
        } // END - if
 } elseif (isGetRequestElementSet('logout')) {
        // Only try to remove cookies
-       if (destroyAdminSession()) {
+       if (destroyAdminSession(TRUE)) {
                // Load logout template
                if (isGetRequestElementSet('register')) {
                        // Secure input
@@ -374,19 +374,19 @@ if (!isAdminRegistered()) {
                case '404': // Administrator login not found
                        setPostRequestElement('login', $ret);
                        displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
-                       destroyAdminSession();
+                       destroyAdminSession(TRUE);
                        break;
 
                case 'password': // Wrong password
                        setPostRequestElement('login', $ret);
                        displayMessage('{--WRONG_PASS--}');
-                       destroyAdminSession();
+                       destroyAdminSession(TRUE);
                        break;
 
                case 'session': // Invalid admin session
                        setPostRequestElement('login', $ret);
                        displayMessage('{--INVALID_ADMIN_SESSION--}');
-                       destroyAdminSession();
+                       destroyAdminSession(TRUE);
                        break;
 
                default: // Others will be logged
index 9476cb086367fa14ce4fa9b21d26db7ee2f56874..a9ba79610137c0a415f9006d98b13535aaa9573b 100644 (file)
@@ -865,9 +865,10 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 }
 
 // Build a special template list
-function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
        // Call inner (general) function
-       doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId);
+       doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
 }
 
 // Change status of "build" list
@@ -967,7 +968,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 }
 
 // Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
@@ -998,12 +999,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
                }
        } else {
                // List for deletion confirmation
-               adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
        }
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
@@ -1034,11 +1035,12 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
                }
        } else {
                // List for editing
-               adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
        }
 }
 
 // Un-/lock rows by given id numbers
+// @TODO rawUserId/content is not yet supported
 function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
@@ -1063,6 +1065,7 @@ function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 }
 
 // Undelete rows by given id numbers
+// @TODO rawUserId/cacheFiles/content is not yet supported
 function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
        // $tableName must be an array
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
index 3891d32aa66833d23ad71075570e9be98bac73b9..ba4c0e27b3af3c1f3cb0fbdad083778d544c4793 100644 (file)
@@ -43,7 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 }
 
 // List all entries
-doGenericXmlTemplateCallback('admin_list_user_subid_stats');
+doGenericXmlTemplateCallback('admin_list_user_subid_stats', array(
+       'id'     => bigintval(getRequestElement('id')),
+       'userid' => bigintval(getRequestElement('userid'))
+));
 
 // [EOF]
 ?>
index 60570ece3307b7c434823eb65cb9900d9ee2e586..ed1611572c51a5217c1f22e31c0d195ec3beca44 100644 (file)
@@ -45,16 +45,23 @@ addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
 // @TODO Rewrite those lines to filter
-$EXCLUDE_LIST = '';
-if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
-if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
-if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
-if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+$userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+if (isValidUserId(getDefRefid()))              $userExclusionSql .= ' AND d.userid != {?def_refid?}';
+if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND d.userid != {?beg_userid?}';
+if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND d.userid != {?bonus_userid?}';
+if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND d.userid != {?doubler_userid?}';
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $userExclusionSql .= " AND d.`holiday_active`='N'";
 
 // Check for all accounts
 $result = SQL_QUERY("SELECT
-       d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`email`, d.`joined`, d.`last_online`, d.`ap_notified`
+       d.`userid`,
+       d.`gender`,
+       d.`surname`,
+       d.`family`,
+       d.`email`,
+       d.`joined`,
+       d.`last_online`,
+       d.`ap_notified`
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
 WHERE
@@ -62,7 +69,7 @@ WHERE
        (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
-       ".$EXCLUDE_LIST."
+       " . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC", __FILE__, __LINE__);
 
index 506804755fc7ed05d8d5e10d4d7684713ceea3c2..fe4c5c33b0589a0317c74c1057b473f41cc736ed 100644 (file)
@@ -123,8 +123,14 @@ ORDER BY
                        $OUT .= loadTemplate('admin_list_network_array_translation_row', TRUE, $row);
                } // END - while
 
+               // Prepare array with generic elements
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_array_translation', FALSE, $OUT);
+               loadTemplate('admin_list_network_array_translation', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}');
index 1831d44610303f3646943440a9174e8e8bb6e2c5..aa369cd69c63d113795f3773e0a451a132fb7161 100644 (file)
@@ -98,11 +98,11 @@ INNER JOIN
 ON
        p.`network_type_id`=t.`network_type_id`
 WHERE
-       p.`network_id`=%s".$ADD."
+       p.`network_id`=%s" . $ADD . "
 ORDER BY
        t.`network_type_handler` ASC,
        p.`network_request_param_id` ASC",
-               array(getRequestElement('network_id')), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__);
 
        // Are there entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -119,8 +119,14 @@ ORDER BY
                        $OUT .= loadTemplate('admin_list_network_request_params_row', TRUE, $row);
                } // END - while
 
+               // Prepare content array
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_request_params', FALSE, $OUT);
+               loadTemplate('admin_list_network_request_params', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}');
index 91adcd523b79fe5dfbee5286f483eec11ccdc1e1..13ea31cdfb2c51ca05073ed78bbb95baea092cf3 100644 (file)
@@ -84,7 +84,7 @@ WHERE
        `network_id`=%s
 ORDER BY
        `network_type_handler` ASC',
-               array(getRequestElement('network_id')), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__);
 
        // Are there entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -98,8 +98,14 @@ ORDER BY
                        $OUT .= loadTemplate('admin_list_network_types_row', TRUE, $row);
                } // END - while
 
+               // Generate array
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_types', FALSE, $OUT);
+               loadTemplate('admin_list_network_types', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');
index 82bf013f46087d6220f91f123a875337e80bed36..0bc39996e5dff26b0e3435d97fca22cf56db2fe6 100644 (file)
@@ -81,7 +81,7 @@ WHERE
        `network_id`=%s
 ORDER BY
        `network_vcheck_param_id` ASC",
-               array(getRequestElement('network_id')), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__);
 
        // Are there entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -95,8 +95,14 @@ ORDER BY
                        $OUT .= loadTemplate('admin_list_network_vcheck_params_row', TRUE, $row);
                } // END - while
 
+               // Prepare generic array
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_vcheck_params', FALSE, $OUT);
+               loadTemplate('admin_list_network_vcheck_params', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_VCHECK_PARAMETER_404=' . $networkData['network_title'] . '%}');
index c954fa448141d9240625a345035f767c1e4ab6d8..c67f0d50ad8b0677025abf03862b8a00d3fe761f 100644 (file)
@@ -48,7 +48,9 @@ if (isGetRequestElementSet('userid')) {
        // Delete entries?
        if (isFormSent('do_delete')) {
                // Remove entries from database
-               doGenericXmlTemplateCallback('admin_delete_do_nickname_history');
+               doGenericXmlTemplateCallback('admin_delete_do_nickname_history', array(
+                       'userid' => bigintval(getRequestElement('userid'))
+               ));
        } // END - if
 
        // List all entries per user
index d655ed3d7c50598c3217bcbf8125b8ae38d88a1f..6da574df143aa1b06723be01fcb019a9f1122c63 100644 (file)
@@ -58,25 +58,35 @@ if ((countRequestPost() > 0) && (!ifPostContainsSelections('id')) && (!ifPostCon
 // Edit or delete button hit?
 if (isFormSent('edit')) {
        // Show entries for editing
-       doGenericXmlTemplateCallback('admin_edit_show_user_subid');
+       doGenericXmlTemplateCallback('admin_edit_show_user_subid', array(
+               'userid' => bigintval(getRequestElement('userid'))
+       ));
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_edit')) {
        // Change data of entries
-       doGenericXmlTemplateCallback('admin_edit_do_user_subid');
+       doGenericXmlTemplateCallback('admin_edit_do_user_subid', array(
+               'userid' => bigintval(getRequestElement('userid'))
+       ));
 } elseif (isFormSent('delete')) {
        // Show entries for deletion
-       doGenericXmlTemplateCallback('admin_delete_show_user_subid');
+       doGenericXmlTemplateCallback('admin_delete_show_user_subid', array(
+               'userid' => bigintval(getRequestElement('userid'))
+       ));
 
        // Do not show the list of URLs after this template
        $show = FALSE;
 } elseif (isFormSent('do_delete')) {
        // Remove entries from database
-       doGenericXmlTemplateCallback('admin_delete_do_user_subid');
+       doGenericXmlTemplateCallback('admin_delete_do_user_subid', array(
+               'userid' => bigintval(getRequestElement('userid'))
+       ));
 } elseif (isFormSent('do_delete_stats')) {
        // Remove entries from database
-       doGenericXmlTemplateCallback('admin_delete_do_user_subid_stats');
+       doGenericXmlTemplateCallback('admin_delete_do_user_subid_stats', array(
+               'userid' => bigintval(getRequestElement('userid'))
+       ));
 } elseif ((isGetRequestElementSet('do')) && (isGetRequestElementSet('id'))) {
        // Construct module name
        $incFile = sprintf("inc/modules/admin/subid-%s.php", SQL_ESCAPE(getRequestElement('do')));
index 9af3c5b268017eed22d2e3d75e00b5683a6b51ef..b0b960fab2457d86886bc2b9b903e7cc6ba5f7e9 100644 (file)
@@ -60,9 +60,9 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 
                // Which is the latest version on server?
                $ONLINE = array(
-                       'version'  => trim(str_replace(chr(10), '', $response[0])),
-                       'changed'  => trim(str_replace(chr(10), '', $response[1])),
-                       'revision' => trim(str_replace(chr(10), '', $response[2])),
+                       'version'  => trim(str_replace(PHP_EOL, '', $response[0])),
+                       'changed'  => trim(str_replace(PHP_EOL, '', $response[1])),
+                       'revision' => trim(str_replace(PHP_EOL, '', $response[2])),
                        'code'     => '200 OK'
                );
        } else {
index 16eb57d7a2afd0f2dee71c34f07e3ef5057c6848..0078fc0a25b3abaf731a5bcc3aac2e2ac3bd4cd6 100644 (file)
@@ -100,7 +100,7 @@ LIMIT 1",
                        } // END - if
 
                        // Remove new-line and carriage-return characters
-                       $TEST = str_replace(array(chr(10), chr(13)), array('', ''), postRequestElement('text'));
+                       $TEST = str_replace(array(PHP_EOL, chr(13)), array('', ''), postRequestElement('text'));
 
                        // Text length within allowed length?
                        if (strlen($TEST) > getConfig('max_tlength')) {
index 5dfaf1366ea16d11910be5c7a9bc4de5cacd1cc8..fad3d46bc2860332d0d8358e6f363daa47edd8af 100644 (file)
@@ -1066,7 +1066,7 @@ function sendAdminEmails ($subject, $message, $isBugReport = FALSE) {
        // Is it a bug report?
        if ($isBugReport === TRUE) {
                // Then add a reply-to line back to the author (me)
-               $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+               $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
        } // END - if
 
        // Load all admin email addresses
@@ -1850,7 +1850,7 @@ LIMIT 1",
 }
 
 // List all given rows (callback function from XML)
-function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) {
+function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) {
        // Verify that tableName and columns are not empty
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // No tableName specified
@@ -1938,11 +1938,11 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId,
        } // END - if
 
        // Now handle all over to the inner function which will execute the listing
-       doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters);
+       doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
 }
 
 // Do the listing of entries
-function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
+function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array(), $content = array()) {
        // Run the SQL query
        $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
@@ -1950,11 +1950,11 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
        if (!SQL_HASZERONUMS($result)) {
                // List all URLs
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($row = SQL_FETCHARRAY($result)) {
                        // "Translate" content
                        foreach ($callbackColumns as $columnName => $callbackName) {
                                // Fill the callback arguments
-                               $args = array($content[$columnName]);
+                               $args = array($row[$columnName]);
 
                                // Is there more to add?
                                if (isset($extraParameters[$columnName])) {
@@ -1965,15 +1965,24 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $
                                // Call the callback-function
                                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');
                                // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-                               $content[$columnName] = call_user_func_array($callbackName, $args);
+                               $row[$columnName] = call_user_func_array($callbackName, $args);
                        } // END - foreach
 
                        // Load row template
-                       $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $content);
+                       $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $row);
                } // END - while
 
+               // Is at least one entry set in content?
+               if ((is_array($content)) && (count($content) > 0)) {
+                       // Then add generic 'rows' element
+                       $content['rows'] = $OUT;
+               } else {
+                       // Direct output is content
+                       $content = $OUT;
+               }
+
                // Load main template
-               loadTemplate(trim($tableTemplate[0]), FALSE, $OUT);
+               loadTemplate(trim($tableTemplate[0]), FALSE, $content);
        } else {
                // No URLs in surfbar
                displayMessage('{--' .$noEntryMessageId[0] . '--}');
@@ -2288,7 +2297,8 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
 }
 
 // Build a special template list
-function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
        // $tableName and $idColumn must bove be arrays!
        if ((!is_array($tableName)) || (count($tableName) != 1)) {
                // $tableName is no array
@@ -2316,10 +2326,10 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                // Is there one entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Load all data
-                       $content = SQL_FETCHARRAY($result);
+                       $row = SQL_FETCHARRAY($result);
 
                        // Filter all data
-                       foreach ($content as $key => $value) {
+                       foreach ($row as $key => $value) {
                                // Search index
                                $idx = searchXmlArray($key, $columns, 'column');
 
@@ -2335,8 +2345,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                if ($key == $userIdColumn[0]) {
                                        // Add it again as raw id
                                        //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
-                                       $content[$userIdColumn[0]] = convertZeroToNull($value);
-                                       $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
+                                       $row[$userIdColumn[0]] = convertZeroToNull($value);
+                                       $row[$userIdColumn[0] . '_raw'] = $row[$userIdColumn[0]];
                                } // END - if
 
                                // If the key matches the idColumn variable, we need to temporary remember it
@@ -2351,7 +2361,8 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                } // END - if
 
                                // Try to handle call-back functions and/or extra values
-                               $content[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $content[$key], $userIdColumn, $idx);
+                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]);
+                               $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, $key);
                        } // END - foreach
 
                        // Then list it
@@ -2359,7 +2370,7 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                                $prefix,
                                $listType,
                                $tableName[0]
-                               ), TRUE, $content
+                               ), TRUE, $row
                        );
                } // END - if
 
@@ -2367,12 +2378,21 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
                SQL_FREERESULT($result);
        } // END - foreach
 
+       // Is there an entry in $content?
+       if ((is_array($content)) && (count($content) > 0)) {
+               // Use generic 'rows'
+               $content['rows'] = $OUT;
+       } else {
+               // Use direct output
+               $content = $OUT;
+       }
+
        // Load master template
        loadTemplate(sprintf("%s_%s_%s",
                $prefix,
                $listType,
                $tableName[0]
-               ), FALSE, $OUT
+               ), FALSE, $content
        );
 }
 
index cd66947b06077a5fd4950bb17f8380dec482c806..da6b87a34e22b451430c3cef7defe743b38c1857 100644 (file)
@@ -111,7 +111,7 @@ ORDER BY
                } // END - while
 
                // Remove last comma
-               $content['userids'] = implode(chr(10), $userids);
+               $content['userids'] = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
                sendAdminNotification('{--ADMIN_AUTOPURGE_INACTIVE_SUBJECT--}', 'admin_autopurge_inactive', $content);
@@ -156,7 +156,7 @@ ORDER BY
                } // END - while
 
                // Display all userids
-               $useridsContent = implode(chr(10), $userids);
+               $useridsContent = implode(PHP_EOL, $userids);
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
index 106302b6542fee71b56e7a0526e02bb9da5d6d47..741db75b61517924cef73cf3a19c961832072188 100644 (file)
@@ -81,7 +81,7 @@ ORDER BY
                } // END - while
 
                // Remove last comma
-               $userids = str_replace(', ', chr(10), substr($userids, 0, -2));
+               $userids = str_replace(', ', PHP_EOL, substr($userids, 0, -2));
 
                // Send mail notification to admin
                if (getConfig('ap_un_notify') == 'Y') {
index e61d9788751d69dfd852a1cf351cab7a2d47c615..a889ec1b90d8b501e3e9028db8de5a3fcf904c3b 100644 (file)
@@ -98,7 +98,7 @@ function getRepositoryData ($type = 'Revision') {
                                $new = TRUE;
                        } else {
                                // Revision file found
-                               $ins_vers = explode(chr(10), readFromFile($FQFN));
+                               $ins_vers = explode(PHP_EOL, readFromFile($FQFN));
 
                                // Get array for mapping information
                                $mapper = array_flip($GLOBALS['repository_search_for']);
@@ -124,7 +124,7 @@ function getRepositoryData ($type = 'Revision') {
                // Has it been updated?
                if ($new === TRUE)  {
                        // Write it
-                       writeToFile($FQFN, implode(chr(10), getArrayFromRepositoryData()));
+                       writeToFile($FQFN, implode(PHP_EOL, getArrayFromRepositoryData()));
 
                        // ... and call recursive
                        $ret = getRepositoryData($type);
index 7601911fc83cda7d869817202f844b493098a9eb..cea985df62ed930f8e1859b54832534b3c5cc836 100644 (file)
@@ -122,14 +122,14 @@ function destroyMemberSession ($destroy = FALSE) {
        // Remove all user data from session
        if ($destroy === TRUE) {
                // Destroy whole session
-               return session_destroy();
+               return destroySession();
        } else {
                return ((setSession('userid', '')) && (setSession('u_hash', '')));
        }
 }
 
 // Destroys the admin session
-function destroyAdminSession ($destroy = TRUE) {
+function destroyAdminSession ($destroy = FALSE) {
        // Kill maybe existing session variables including array elements
        setAdminId(0);
        setAdminMd5('');
@@ -140,12 +140,33 @@ function destroyAdminSession ($destroy = TRUE) {
 
        // Destroy session if requested and return status
        if ($destroy === TRUE) {
-               return session_destroy();
+               return destroySession();
        } // END - if
 
        // All fine if we shall not really destroy the session
        return TRUE;
 }
 
+// Destroys session and resets some "caches"
+function destroySession () {
+       // Unset "cache"
+       unset($GLOBALS['isSessionValid']);
+
+       // Destroy session
+       return session_destroy();
+}
+
+// Checks whether the session is valid
+function isSessionValid () {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Then determine it
+               $GLOBALS[__FUNCTION__] = ((isset($GLOBALS['valid_session'])) && ($GLOBALS['valid_session'] === TRUE) && (isset($_COOKIE[session_name()])));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>
index e8b9e2331719b5404bb4632c1fae971f8aeee82a..1849e2f9a8016f3e9d5729d232f2a0178e227a55 100644 (file)
@@ -50,9 +50,10 @@ if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) {
 } // END - if
 
 // Is a session id there?
-if (session_id() == '') {
+if (!isSessionValid()) {
        // Start the session
-       $GLOBALS['valid_session'] = session_start();
+       $GLOBALS['valid_session']  = session_start();
+       $GLOBALS['isSessionValid'] = TRUE;
 } // END - if
 
 // Load language file(s)
index 208c2f21267780c53be2bf487f72bd1284fe0847..dcf627628fd42a68acf14129737b5bb828a619cf 100644 (file)
@@ -112,7 +112,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) {
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)
                                        if ($newLine === TRUE) {
-                                               outputRawCode(chr(10));
+                                               outputRawCode(PHP_EOL);
                                        } // END - if
                                } else {
                                        // Render mode for old or lame servers...
@@ -120,7 +120,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) {
 
                                        // That's why you don't need any \n at the end of your HTML code... :-)
                                        if ($newLine === TRUE) {
-                                               $GLOBALS['__output'] .= chr(10);
+                                               $GLOBALS['__output'] .= PHP_EOL;
                                        } // END - if
                                }
                                break;
@@ -135,7 +135,7 @@ function outputHtml ($htmlCode, $newLine = TRUE) {
                                // The same as above... ^
                                outputRawCode($htmlCode);
                                if ($newLine === TRUE) {
-                                       outputRawCode(chr(10));
+                                       outputRawCode(PHP_EOL);
                                } // END - if
                                break;
 
@@ -1501,7 +1501,7 @@ function linenumberCode ($code)    {
 
        if (!is_array($code)) {
                // We need an array, so try it with the new-line character
-               $codeE = explode(chr(10), $code);
+               $codeE = explode(PHP_EOL, $code);
        } // END - if
 
        $count_lines = count($codeE);
@@ -1702,16 +1702,16 @@ function sendModeMails ($mod, $modes) {
                                                switch ($mode) {
                                                        case 'normal': break; // Do not add any special lines
                                                        case 'email': // Email was changed!
-                                                               $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestElement('old_email') . chr(10);
+                                                               $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestElement('old_email') . PHP_EOL;
                                                                break;
 
                                                        case 'password': // Password was changed
-                                                               $content['message'] = '{--MEMBER_CHANGED_PASS--}' . chr(10);
+                                                               $content['message'] = '{--MEMBER_CHANGED_PASS--}' . PHP_EOL;
                                                                break;
 
                                                        default:
                                                                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
-                                                               $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . "\n\n";
+                                                               $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . PHP_EOL . PHP_EOL;
                                                                break;
                                                } // END - switch
                                        } // END - foreach
@@ -2295,7 +2295,7 @@ function anonymizeSensitiveData ($data) {
  */
 function compactContent ($uncompactedContent) {
        // First, remove all tab/new-line/revert characters
-       $compactedContent = str_replace(chr(9), '', str_replace(chr(10), '', str_replace(chr(13), '', $uncompactedContent)));
+       $compactedContent = str_replace(chr(9), '', str_replace(PHP_EOL, '', str_replace(chr(13), '', $uncompactedContent)));
 
        // Then regex all comments like <!-- //--> away
        preg_match_all('/<!--[\w\W]*?(\/\/){0,1}-->/', $compactedContent, $matches);
index c8b651cf2196a4f1cf76eb087267ddf136b43ac8..ba56fb2c8e3e9d5bab2e12f2020d764694fc292a 100644 (file)
@@ -2789,7 +2789,7 @@ function ifUserPointsLocked ($userid) {
 // This function does always add a new-line character to every line.
 function appendLineToFile ($file, $line) {
        $fp = fopen($file, 'a') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($file) . '!');
-       fwrite($fp, $line . chr(10));
+       fwrite($fp, $line . PHP_EOL);
        fclose($fp);
 }
 
index 217f8e73a0b901fea4a1756624d3d95d66f38ae4..2a11ccc4b72ebcfc413fd323abf9af4262614a4c 100644 (file)
@@ -100,6 +100,7 @@ function doGenericXmlTemplateCallback ($template, $content = array(), $compileCo
                );
                $GLOBALS['__XML_ARGUMENTS'] = array();
                $GLOBALS['__COLUMN_INDEX']  = array();
+               $GLOBALS['__XML_CONTENT']   = $content;
 
                // Handle it over to the parser
                parseXmlData($templateContent);
@@ -108,7 +109,7 @@ function doGenericXmlTemplateCallback ($template, $content = array(), $compileCo
                addXmlSpecialElements($template);
 
                // Call the call-back function
-               doCallXmlCallbackFunction();
+               doCallXmlCallbackFunction($content);
        } else {
                // Template not found
                displayMessage('{%message,XML_TEMPLATE_404=' . $template . '%}');
@@ -188,11 +189,11 @@ function doCallXmlCallbackFunction () {
                                // Is it there?
                                if (!function_exists($callbackName)) {
                                        // No, then please add it
-                                       reportBug(__FUNCTION__, __LINE__, 'callback=' . $callback . ',function=' . $function . 'arguments()=' . count($GLOBALS['__XML_ARGUMENTS'][$callback]) . ' - execute call-back does not exist.');
+                                       reportBug(__FUNCTION__, __LINE__, 'callback=' . $callback . ',function=' . $function . ',arguments()=' . count($GLOBALS['__XML_ARGUMENTS'][$callback]) . ',content()=' . count($GLOBALS['__XML_CONTENT']) . ' - execute call-back does not exist.');
                                } // END - if
 
                                // Call it
-                               call_user_func_array($callbackName, array($function, $GLOBALS['__XML_ARGUMENTS'][$callback], $GLOBALS['__COLUMN_INDEX'][$callback]));
+                               call_user_func_array($callbackName, array($function, $GLOBALS['__XML_ARGUMENTS'][$callback], $GLOBALS['__COLUMN_INDEX'][$callback], $GLOBALS['__XML_CONTENT']));
                        } // END - foreach
                } else {
                        // Not found
index 66b412d936ab65d3b1d7229674705c367e0c7aa4..ae2a3152dd2b3c2067390525254333f772da226c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admin_add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admin_add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
@@ -38,5 +38,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 49c39818f56b2d54684cd3c6f92f131c822fe1c7..f91dacbcf277c7e5428a8432d8d81858b1f966ac 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -37,5 +37,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 2200018423c7552a3c049cb73677f2ecaf22b3e8..af8528b18bed0c69a6a05831bbaf327659dd799a 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_admins_acls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -35,5 +35,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d291f5bc8ddeb8780e03e9da1a30a14f9569f68b..602eae776a8adc4130e16a6eb18265dbb14ab20e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_bank_package%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_bank_package%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 5d22c877df236e1e6fcc36a08fa50a4cc3c2bef5..411b0189ea47dd537399d5294aabdbe1416935c0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -45,5 +45,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b1c93a73fc8da169b832a226f3ac32906e45b7b6..cc4d110cc3ea25635e4d737873fea2c3dace8ef5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?%}" method="get">
+{%form,formMethodGet=modules.php%}
 <div class="dashed">
        <div class="table_header bottom">
                <strong>{%message,ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_TITLE=$content[network_type_handler]%}</strong>
@@ -17,5 +17,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index ae4d4a349e066c8c4261b6197de066bda667be64..5d424426ff3f6701c9f99ba276d7fb1d4955a5a7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]&amp;network_type_id=$content[network_type_id]&amp;do=add_handler_types_config%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]&amp;network_type_id=$content[network_type_id]&amp;do=add_handler_types_config%}
 <div class="table dashed">
        <div class="table_header bottom">
                <div>
@@ -44,7 +44,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 809e2879c3c590d2a9ae469c74921e47d7036827..bd80fe1ad8b4e0d8d6b1bc112f1f09462e06a49b 100644 (file)
@@ -1,4 +1,5 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_country%}" method="post">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_country%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="430">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -34,4 +35,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
+</div>
index ad5dd02e408af0ff9550f6e261213bd29c8fb686..046527c08b1b27e35f1a20caeba9f0bb41aa6af6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_ads%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -89,5 +89,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 36df4b8234b72d7fcab6c80f832a97cf66de9ca8..669a665ae084340d69f95546bb03389577c078fa 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_campaigns%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_campaigns%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -68,7 +68,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 36420bddbc36afcad6294d5e13a81c11e1bbcc99..d21798dbd7749053de22ab07e9588d63ebf68110 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_costs%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_costs%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -41,7 +41,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="tiny notice">
index 5453ed006151aff2f2ae3905f1b590c98afa1bf4..378257a50cdfee0d35971ad405ad9292867dbddc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_grade_data%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_grade_data%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -44,7 +44,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index b60cbbd710207c435aec047f1e172e2a48b81560..0c2424aca9e602891f50b3940c0e5809f0035c82 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=guest_add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=guest_add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
@@ -50,5 +50,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 9984cadfc02f97cea4f0d2537b2f4825f36fe1b0..8915f38bab2fa2a6ba81ba86357bc90cdb9f153b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_email_max_rec%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
@@ -28,5 +28,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ba7bc2186873dda26a3d6a78eda5439818da6137..34328fb4f5e018334f8ff6b135b03358619bffd6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=mem_add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=mem_add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
@@ -50,5 +50,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 5eef712c65381bf90f17af7ea8d37f7b4bec8f86..761401fbf6578e963f5d694fe43b990abb8653b0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_data&amp;do=add_network%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_data&amp;do=add_network%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -69,7 +69,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 9bc4887ce2279ef7151ccae9983eaf3661509568..67bd737b54d1832e46fd53f4ef3ffff912b24500 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=add_network_array_translation%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=add_network_array_translation&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -32,7 +32,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 4f70df3ab1b8f5d36840abae76176427a7d14f6a..0217d37cf986b47b0982498cd17938767eb885cb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=add_request_param%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_request_params&amp;do=add_request_param&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -44,7 +44,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index e4bda05bdda4b5820fe0041234000c31c7c46093..57af05e89ebdd244f1463d423d68730b357d8e2c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_types&amp;do=add_network_type&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -56,7 +56,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 6f0d4891d7c26b9348ff25e4a036cd701c9c4c2c..09a6da5a8224de3dcc7c5cbc8488e28cb424f5c4 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=add_vcheck_param%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=add_vcheck_param&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -36,7 +36,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 851322593918b9527787489451f91429a377ef0a..46287db1dfdbbcc377001ff725c0c1739e27f31d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=payments&amp;do=add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="410">
        <tr>
                <td class="table_header bottom" colspan="2">
@@ -39,5 +39,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 2af9902da515c4ca5506ecd151145424384d90b7..5f40c3a1b6566882b5b29bc63c65eeecf3faf5a9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_payouts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
@@ -88,7 +88,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="table dashed">
        <div class="table_header bottom">
index 7cba13006d66496ee5fbfa52bfed65851a66394c..43fc738d01d144cdd51f6f3e3c7996e0eb414335 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_point_accounts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_point_accounts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" align="center" colspan="2">
@@ -59,7 +59,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="para notice">
index 105ee5c0e9d357b70dd06562b33abcae88b128cf..09348da8706afff77853267bf13b17512773c575 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_points&amp;userid=$content[userid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_points&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -26,5 +26,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d696608188ba5268411b5e4e2102741b3237adac..66d5c55caf0cd7a10ab77ee8274b3d15f7bab914 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_points&amp;userid=all%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_points&amp;userid=all%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -25,5 +25,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 58bde3d153d073360afb7099578adf63c40a8a1c..c1964eb3e31946593f58974cab23021c40a52cf8 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_rallye%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_rallye%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -81,5 +81,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 79b60b25d6140b3335198c79f0e979497eb22531..0dbb3d257330b3dcb2775acfb686a2e3bd5d3d59 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -31,5 +31,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 72b919eb3ae11c5e65e74372911fdaf01153746c..d6d1f8aed9abd3a9da71a9ef2dc56b8908971073 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner%}&amp;do=add" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=refbanner&amp;do=add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="410">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -34,5 +34,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d70776d9bdcb8c66ceb25b8521daf7351b988658..4d3fcceb6ac8ed4bf2a71e61e215f2a3418822d0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=add%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=add%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -25,5 +25,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index bd3de060182dd4f2d192759af1400994574b89ee..5455b6bd07206a64dc82942f10c9810a2564146a 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_sponsor%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b9300c562e1e2253784d2320f259e65ffdba56f8..d20078fd483290f5a6e77b00197972f9bff93c77 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_sponsor%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" align="center">
@@ -20,5 +20,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 0f9fa2bdb675dd97b3d0893619102c08542a2c2c..aa6d9679a7c78a7080e5c10cc111cb0d8e94a787 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor_pay%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_sponsor_pay%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
@@ -29,7 +29,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice tiny" align="left">
index 600a0f8865d031770a82376178ce94fb6082b29a..7517ffd775a59cd344c9248b54947eb6e6b0f5f3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_surfbar_url%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_surfbar_url%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_ADD_SURFBAR_URL_TITLE--}</strong>
@@ -31,5 +31,5 @@
                <input type="submit" class="form_submit" name="add" value="{--ADMIN_SURFBAR_ADD_URL_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 42ce66820ea9609f594e4ec38bf78ece6d5c0370..3064d04f6b1aec4e8d67d19c1a86b85b4199860b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=add_tester_user%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=add_tester_user%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_ADD_TESTER_USER_TITLE--}</strong>
@@ -93,7 +93,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--ADMIN_ADD_TESTER_USER_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index bbd2a542169b710d019a7eb9279ab498d0de15a1..77bb782b111e5318b336154c648bb5a429126089 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_contct&amp;id=$content[id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_contct&amp;id=$content[id]%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{%message,ADMIN_CONTACT_ADMINS_TITLE=$content[id]%}</strong>
@@ -13,5 +13,5 @@
                <input type="submit" class="form_submit" name="ok" value="{--ADMIN_ADMINS_CONTACT_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 0cfa2c00af89a2dd81aeb45567c3d88d19a053ac..c7637575c2c0858f3333d290f53859e0c5d1abf6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_mails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_mails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header">
@@ -22,5 +22,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 2f8c2117097b7dc86a0d688c7c663c3b16edf358..1bd75e77247e27d7d44fd75581a67982b724839d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_mails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_mails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
@@ -25,5 +25,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6ec0fb34745e6d9290c51c439680cf2fb9918e74..c876f1cd11ddb7efd41b67a68bc36de51919deb3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_foo%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_foo%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_FOO_TITLE--}</strong>
@@ -21,7 +21,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 646b1fd1559f8cf806a13007fa915d197616a0db..74944e862dfe7556d273d92561d69f4ccb2408de 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_active%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_active%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -19,5 +19,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 4f90a09eb48ac4374de4b66e29e13c9d15b63b95..572d1a43a107ef70b000d526b3014fa9164a54e2 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_admin%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_admin%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_ADMIN_MENU_TITLE--}</strong>
@@ -39,7 +39,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 62a25c509cab2283c86fd75841ca03cb974ae4ac..93f6243b86772c210d9dc03ebb3a5782a3aee4d2 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_autopurge%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_autopurge%}
 <div class="table dashed">
        <div align="center" class="table_header bottom">
                <strong>{--ADMIN_CONFIG_AUTOPURGE_TITLE--}</strong>
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 0e8a428b6d9e5f499f3f125fd3c547fb7a8d4cec..e5945a8fe0d5c7dd0bacdcb56b3448ce4baaa2fc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_beg%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_beg%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3f0cacbe790c73f0099c62d1dda12eb8d39df1f4..8e8d0ad904ae135c9d33e48c515c891892cc163d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_birthday%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_birthday%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -29,7 +29,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 7bae83b7e6c38150d154b97e5fe9ab0e64aff617..92e950e0344397ed8296bf2fdc6b1472be6ed1c8 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_bonus%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_bonus%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6f5ca04471801fad7ed03e9aa5f044d367935f61..fefab08ebfe41f6b6bc4d5bbe53dfe5839eea0b3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_coupon%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_coupon%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -38,5 +38,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3b9d577d3afdd1d539bc83ab36210d9f2df22ee7..d7c8181659ca02d1c1c1951e05c9d32cfdc10ddc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_doubler%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_doubler%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 8f41726960c28f0171fd27489d7176e283bfa11e..87dd723793cf925a0c42aacf5d25ce233b9b9c9d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_extensions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_extensions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 1d3e8936b46d35051fb3223917398558c4848de9..6d964566d3fb96ef91b53b6e601f7452bc049986 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_holiday%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_holiday%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -33,5 +33,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 52eefd2de430d2a7f534b234666b8cbd88f8cb59..bfdd03711b23fe80a64b4f7d16b2c573b1d82db7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="510">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -44,5 +44,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 435556c7eb39aaf557ab10d521d2a315b9a1ef25..11f5d85d80b1ca4d16cf4c19e14af24e5ec2a60f 100644 (file)
@@ -1,44 +1 @@
-<form action="{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=settings" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="510">
-       <tr>
-               <td colspan="3" align="center" class="admin_title bottom2" height="30">
-               <strong>{--ADMIN_EDIT_HOME_SETTINGS--}</strong></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" width="320" height="20">
-               {--ADMIN_CONFIG_INDEX_DELAY--}:</td>
-               <td class="seperator" width="5">&nbsp;</td>
-               <td width="185" align="center"><select name="index_delay"
-                       size="1" class="admin_select">
-                       <option value="-1"$content[-1]>{--ADMIN_INDEX_MANUAL_FORWARD--}</option>
-                       <option value="0"$content[0]>{--ADMIN_INDEX_NO_DELAY--}</option>
-                       <option value="1"$content[1]>1 {--_SECONDS--}</option>
-                       <option value="2"$content[2]>2 {--_SECONDS--}</option>
-                       <option value="3"$content[3]>3 {--_SECONDS--}</option>
-                       <option value="4"$content[4]>4 {--_SECONDS--}</option>
-                       <option value="5"$content[5]>5 {--_SECONDS--}</option>
-                       <option value="10"$content[10]>10 {--_SECONDS--}</option>
-               </select></td>
-       </tr>
-       <tr>
-               <td colspan="3" class="seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</td>
-               <td class="seperator" width="5">&nbsp;</td>
-               <td align="center">{!__INDEX_COOKIE_SELECTION!}</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="bottom2 seperator" height="5">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="3" class="admin_footer">
-                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="admin_submit" name="ok" value="{--SAVE_SETTINGS--}" />
-               </td>
-       </tr>
-</table>
-</form>
\ No newline at end of file
+<!-- @DEPRECATED //-->
index 480175ec9af32f94452f85a2eab31ab8ef6ead4b..0942f36612e446901f782fbaabd23d49a7a328cc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_mediadata%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_mediadata%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="3" align="center">
@@ -23,7 +23,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index c7bca540304edff379a7b4cf35559aa433991b46..3d418df13a3693d86b547b1a2c68f8148c149ae1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_menu%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_menu%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -29,5 +29,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 53ba902b0af8be17de8e29fc769f1961ff3bcb63..7b1580e7d07881ffa18d8f4faab53306670bad21 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_api&amp;do=network_api_config&amp;network_id=$content[network_id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_network_api&amp;do=network_api_config&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
@@ -49,7 +49,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 74b7710b97f750c61a74fa1c50cd1aa9dc443699..20fe83cc9b7d9958d5eacf08f02bd548f60120b8 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_types&amp;do=network_types_config&amp;network_id=$content[network_id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_network_types&amp;do=network_types_config&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
@@ -20,5 +20,5 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index f5d82e971723329d2374a2b516046cd785d479d2..e17e77d68051d5d6296a190d64542b7e56378015 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_newsletter%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_newsletter%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -13,5 +13,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 1c3d9044893b11c28d6b9d550fefc4b258607573..2ef4a0d569b9355f65c60e5ea0fc0097d814accc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_nickname%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_nickname%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -31,5 +31,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 84e5c90e33f2a09d117c01d17541b4bfe15b2be4..edaffe9eec701a1ea12115f9a80406770500aecd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_order%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_order%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_ORDER_TITLE--}</strong>
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 0d16a3adc57884c623ba87ea156555fe36777683..9f42bc28bcd2c5378aacecd3b2281c7b9577c56d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_other%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_other%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 5b840ebc4e30bf8b15bfe0936cbe84c84b9fa606..7a5512a831b8115b3a910e66c3fa3fd5c692ea21 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_payouts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 922f3ca23e1f6706fe3504a005ec12c00fb747c3..c7a802dca20752f2d8c6cf62a3d27d10b1c18955 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -31,5 +31,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a3794110261dde012e0a52c70dd35b2e66da4053..8473d0408d0b4e15713301192fa45f3481a03e01 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_proxy%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_proxy%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -45,5 +45,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 93e1cc4921cad0d5ec86707c2a6ad78594415f5b..d8bc757dfd55fd53bca3c90ef1d0c7c0ad6b88aa 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_refback%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_refback%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -37,5 +37,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 49c3b384a27c44505afcff76ac5460c079c444d6..6891539b4cb6e8bd580c0225f793e2317691d8ff 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_refid%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_refid%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_REFID_TITLE--}</strong>
@@ -52,7 +52,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 6e41d14f6129e2324ebb8f61d654596438ee166e..8a4b12f0839fb559f1c373eaa9971413b03e4a7c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_register%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_register%}
 <table border="0" cellpadding="0" cellspacing="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header">
@@ -19,5 +19,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index fbb6aa710c74cd7deed32db13657a0791e8a47b8..fe024832127e2c2894e09b0d66f7eb02a604d9eb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_register2%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_register2%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -39,5 +39,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 0916ddb8c7ee67f13ab6e033a7e69969d15d4497..330a001c99475939bae7ac98816d5d0ecfbc2880 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_removeip%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_removeip%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
@@ -89,5 +89,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b9e81e14ed608453b42b5a91d8fbe84dc30d3ef0..28cb2d8c24f865bcb0c9cbfc7f3d9f341671f68f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rewrite%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_rewrite%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <!-- @TODO No title here? //-->
        <tr>
@@ -21,7 +21,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index d8b76db89422060da7434c04b2abd8400b62ec2d..dc80e13abc7f15bb8f656dca02c7ca78d662cb91 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_secure%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_secure%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="3" align="center">
@@ -32,7 +32,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 439e92ef3da4ad0b4854479f85e2da9386959e6f..a64ff5b10c1864c5d2455ff4cdbf0b56a787a13b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_session%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_session%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -30,5 +30,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index f9793b114fc19c9eb8080ad4e0341d1533c65812..75fe947849dacf7b858b25fecc214684d71c9e7d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_sponsor%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_sponsor%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
@@ -29,5 +29,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6cedde5fb94f4dfcf1494697e281a884c4bd6399..3655c36ff3154e5fbec268fb913759aa8e8bfb62 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_stats%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_stats%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -48,5 +48,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 945c161a1de486cebbdb38e22b16ff2c1449646c..f8dcc4d0d5f719f5dfb2f111231f3ff47d9ad0db 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=points%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=points%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -25,5 +25,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 37036e70a63937f622df26bbc7716bf9d6c8ab7f..bf4d3fffe3da163d2fe05b85dd5b44af33af8932 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_surfbar%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_surfbar%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index c33fdad2bb53f2411fbe8271632a195016a9e3b9..bb6d863d02f13916bea0da30222581448fd824f2 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_timezone%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_timezone%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 5bddc467f5d1dc0bb15a468ac5886d886955d9bc..a75ec618e92b910d5515cdf0faab1e96e4d838a2 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_title%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_title%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_TITLE_SETTINGS--}</strong>
@@ -47,7 +47,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 0d02b242e22f7a3d77a7c58ffd971c3d2fd0192e..53527b568a0a310a2d7a9243828b12dfa9bc82bd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_top10%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_top10%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -19,5 +19,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6dc3b0c931085c5ffdccae1104c57296ead2818a..cd02d0764d7c9376049c9d381e360129111fa357 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_transfer%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_transfer%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -49,5 +49,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6e5fa7bdb807fc4754c6bdaf2c12a02c12a5d0aa..feced38c73180b43f0fcb37f896e1593da04060b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_user%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_user%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_CONFIG_USER_TITLE--}</strong>
@@ -85,5 +85,5 @@
                <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 84aca3ac1453ac4f63dba0744eb48900a828105a..e14934da69746bfd50f4f25abf8b5db74e9c09b3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_validator%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_validator%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 8159e010b247755dcda95916183cd02b33e2c904..5d249920d4388777d6c0a7a336e4f7f99b8468e0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_wernis%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_wernis%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index a6befebaaf7fc3b1cddc515a5e4fd4e1a5185301..b94f8d378bbd3baff5ca2e881969028005ac59ec 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_yoomedia%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_yoomedia%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
@@ -81,7 +81,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index cefd999df38a60ccff6dc06c6e5cbd00ceb67898..8752a453fa25e6228857a08c79bd819a13174cfe 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=user_contct&amp;userid=$content[userid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=user_contct&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td align="center" class="table_header bottom">
@@ -19,5 +19,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a9522250027578fa056dc883a3dbf41b578f9396..c1b3ab5324925fcf5160ed95ccb28dd2faf9a97b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_bank_package%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_bank_package%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="5" align="center" class="table_header">
@@ -19,7 +19,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 2d42e33c10a826c58d68439e90f8755840a7664f..3998f9f30d053961b6949274f6eeb1e3116fb22f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header" height="40">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ff2920f8be8c8c44dcc8dc8ac1b5563341ae3051..3162be774e56239ff79c8c33afa9e9d3bda1a2ff 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 78b6730c522842cdaaa1e263f85e84726e3299b4..b0a8a5a1d6c381b83c977561490d9fd82a729cfd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_admins_acls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 447f901027125186f7174b9073c9fb043ca1079a..517ed0e5360f4c707407f40230f01c4da0b07927 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_cats&amp;do=del%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats&amp;do=del%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
@@ -13,5 +13,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 824b32d607e7fadaf87235d0dae6eec2d39c12e3..5d93e2d246ddeef1a09e181fa244a2f97333a022 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec&amp;do=delete%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_email_max_rec&amp;do=delete%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
@@ -13,5 +13,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 87483eac4096074365cea972153437480651516e..3516081211456171ee7b0bd0c7efa495a9dc3622 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=extensions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header">
@@ -18,5 +18,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 669c7b41c13914bd356d1052fe9b2eeb3a050d9f..676e0dbfc2f8514664c5a58ebf7e78748c116acf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads&amp;do=delete_forced_ads%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_ads&amp;do=delete_forced_ads%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 8039d7e912fde2065021dd91320a91b11bcdfcc4..f3b4d7daa2d3920e2ad54f3decd42251908fcb53 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_costs&amp;do=delete_forced_costs%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_costs&amp;do=delete_forced_costs%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ff364427096793cbb0732e31e6d8f7010ccc8d83..ff4ca3a7e323858d398152942febf3a740485797 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header" height="40">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 31a1910a9fa35dbec371070d8f5cf723b077ca0a..5133b09491fb0cd89a79536a657b20d3c191d4d7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index cee78fda6cd1f1aa9dff92d6d0c5099472887469..891e1dfea56976cbedd087faee9192263be282be 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=remove_network_array_translation%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=remove_network_array_translation&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_REMOVE_NETWORK_ARRAY_TRANSLATION_SUBMIT--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index a61240a7cb218d32ab2ee06bf4b726d478206ca8..2829502bfead838398b22f98b17545cea64a9b00 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=remove_network_request_params%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_request_params&amp;do=remove_network_request_params&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_REMOVE_NETWORK_REQUEST_PARAMETER_SUBMIT--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index a90556315bee6cc8d26f57e0d875e73353e883f3..b49730d6fb4a3dba10843c83d788798608d2ab95 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_types%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_types&amp;do=remove_network_types&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_REMOVE_NETWORK_HANDLER_TYPE_SUBMIT--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 1ab7cb5dfb027fa41689c7561d9c85bd739addea..90d7c3f6486da18034f7d54d9799c5936fb800d5 100644 (file)
@@ -1,19 +1,19 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_data&amp;do=remove_networks%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_data&amp;do=remove_networks%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
                        <strong>{--ADMIN_DELETE_NETWORK_DATA_TITLE--}</strong>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="submit" name="do_delete" class="form_delete" value="{--ADMIN_REMOVE_NETWORK_SUBMIT--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 3e1251546dff8f987f78fb49c1f6d9f8d46a8d25..49d87e1df80d8ffc5d6e3067ff4eb9acd8aed171 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=del%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=payments&amp;do=del%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
@@ -13,5 +13,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 4b965442aff0dced97f49da8863841a25d74acdb..36539af4f679f5a8d2f0682ab10b4bab6db55701 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_payouts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header bottom">
@@ -18,5 +18,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 58f2b35eb020fd479c8483090b4188a73096987c..500951103ee137e4cd8b3358bdf0c2680d4b179c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -27,5 +27,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 151e742a1a11b8e26daefcad44833a99fb092d99..188a20af072856c54f186c920e141810b67679c6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_rallyes%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallyes%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index e463bb02a854b505a8448d3d6b00bc8b767dc247..237f3e7fc6bc8cdf8a96854a01ce4fa015776764 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=del%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=del%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="bottom table_header">
@@ -13,5 +13,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index f68af8a220bd7acb870e072212071adb8570e7b6..13b6fee274b83ad8e04c3f14a194535b65293dc3 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=del_sponsor&amp;id=$content[userid]%}" method="post">
-<div align="center" class="table dashed">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=del_sponsor&amp;id=$content[userid]%}
+<div class="table dashed">
 
 <div class="table_header bottom">
        <div class="table">{%message,ADMIN_HEADER_DELETE_SPONSOR=$content[userid]%}</div>
@@ -23,4 +24,5 @@
 </div>
 
 </div>
-</form>
+{%form_close%}
+</div>
index b14d5bacde09f46d248a0400fbe1ab0a13e63962..192b265ba70a6935f4aa9af047a8c0612eaf7733 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="3" class="table_header">
@@ -18,5 +18,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 2c8a09a84e89fa7b6bbb15bfe262a0ed4d933c9a..534f3d3c1a7c9dfa49dd8b2bdac8a5698e0a6bea 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=del_user&amp;userid=$content[userid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=del_user&amp;userid=$content[userid]%}
 
 <div class="table dashed">
        <div align="center" class="table_header bottom">
@@ -24,5 +24,5 @@
        </div>
 </div>
 
-</form>
+{%form_close%}
 </div>
index a1b757b060571d8c3f8ca4958e4af720c6cea02e..85426228cba0822eed6863c3e352d464442c7d5f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid%}&amp;userid={%get,bigintval=userid%}&amp;do=delete_user_subids" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_user_subid&amp;userid=$content[userid]&amp;do=delete_user_subids%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="3" class="table_header">
@@ -11,7 +11,7 @@
        <td class="header_column bottom right" align="center"><strong>{--SUBID_VALUE--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--SUBID_ADDED--}</strong></td>
 </tr>
-$content
+$content[rows]
 <tr>
        <td class="table_footer" colspan="3">
                <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
@@ -20,5 +20,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 27e04bb204a5ee3b6871edf1da8baad2650dd458..da1fce31ccfc12a7c481938e1023a1fb635d1327 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <!-- @TODO Shouldn't we add a title here? //-->
 <tr>
@@ -18,5 +18,5 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a1e19073482d00b31eca00cb83c79264af4fc21c..2be329b7d67aa0abaa4822a67ff7e14b04e79310 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header" height="40">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3475a0fe1bd51da24b98d5829cfa061a059da4c4..6e6a943e6b443a50aa38f74c77962c577b1b3ade 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="6" align="center" class="table_header bottom">
@@ -22,7 +22,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index c3f55f54f71a360e4f087d0628bb3c2b03beebc9..497e0f4423dd4b69d8ce39bf7ba36f48740f39a0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_admins_acls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d7c7628f38dfcbc4229ff8f6c7ad364474e96a62..3762518418198495471bce3db8a0874dc136e4dc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_bank_package%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_bank_package%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
 <tr>
        <td colspan="4" align="center" class="table_header bottom">
@@ -14,7 +14,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 4f6f0e3d952cb5018267f2a77400015c797d25ee..1f29c87aa327c6e4c02ec715e51d49fca2f889f5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_emails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -38,5 +38,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 59d5dac73170d6dff97ad052797cdc86c50c86cb..0f1696b7b16f162c0670515400ba400d81f2dcce 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_cats&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 450452c9fd8bfec644c6226f5cfab91bb2bc9b9a..35edd3f6242ec31fa7b7d37e6fce927b18da4737 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]&amp;network_type_id=$content[network_type_id]&amp;do=edit_handler_types_config%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_network_types&amp;network_id=$content[network_id]&amp;network_type_id=$content[network_type_id]&amp;do=edit_handler_types_config%}
 <div class="table dashed">
        <div class="table_header bottom">
                <div>
@@ -45,7 +45,7 @@
                <input type="submit" class="form_submit" name="ok" value="{--ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index bac4013681636574f3c0ada8d3bd66261adb1a43..f32359e1a0c5facf73248ceecb6573bc0067b143 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_emails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -38,5 +38,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 9591bb1d511d533b1631c2448283ce137fa8ddf3..ed26d4d5c6ee75ccf7a409f7b85f59f34d0d5810 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_email_max_rec&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 6f6a43bb48d7d373d430f066b1cb869c0d335ab3..a1297f331b21e87e27d5bd070e90407dee5d7dac 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_emails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a9ac2b95aa480ce5e1e76705d814237ef0eaad1c..c4441f598083f24df49740a267bb7e722ffd2c24 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=extensions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ecfedb40f47a6907a00a159e9a6c02618898d794..fb7c0f0e2b36a86634f655fc5058d987e5152c9f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads&amp;do=edit_forced_ads%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_ads&amp;do=edit_forced_ads%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d2a37f0616bdf6ca404876f0803fdcbdbe81a5f6..2f981b7896897569661de1911d4ec769718458bf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_campaigns&amp;do=edit_forced_campaigns%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_campaigns&amp;do=edit_forced_campaigns%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,7 +14,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 0000f0d63245130336e11ee63993d092b1a4a379..185f956d32d9aac08a8f33a4c0a3ad9169246fea 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_costs&amp;do=edit_forced_costs%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_costs&amp;do=edit_forced_costs%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 9afacc1e92e8e9bab9024bba3b3a16f64b488858..facbca5d23a818810f0b725fd1fa72c387bee4bf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="header_column bottom right" align="center" width="30"><strong>{--ID_SELECT--}</strong></td>
@@ -18,5 +18,5 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 0ada43ee60052c136d261fd6a43cd50e66a86502..73baab163452038eebb7ef1539c95d103c432a86 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header" height="40">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d927b1cc8c6bf8b4f5c1fd1f5e62dc7687ae8c85..891a4c01a93c1d7dc22ff15d5e31d491c4cb30c9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header" height="40">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b5b5380c69a398bdfefa7020419abeadf9bf200d..0c015221ace0a5f351c2597babc60033d398377f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_mods%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_mods%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="6" class="table_header bottom" height="40">
@@ -22,5 +22,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 2638b6f28b2976d63bffbc4140f1ed9866932b6b..c93301c3bf387b1b9205056983cacdc414d68584 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=change_array_translation%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=change_array_translation&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
@@ -11,7 +11,7 @@
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
@@ -19,7 +19,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 9642947dd7cd1559002cc72ffd220802dc6a01f5..12d9cc900a79cabd3703e7774ebfe18f03470d2b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=change_request_params%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_request_params&amp;do=change_request_params&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
@@ -11,7 +11,7 @@
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
@@ -19,7 +19,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 465c88df19277314018694225d46aa6e2eaf7219..77ae06f91c148aa828a2b98dff7c89995f16c5da 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=change_handler_types%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_types&amp;do=change_handler_types&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="2">
@@ -11,7 +11,7 @@
                        </div>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
@@ -19,7 +19,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 097ddb05506a42827791d73c8309e81dc6737fb7..944143ab0a12844c7e008ea1c40615f1ccf47bac 100644 (file)
@@ -3,14 +3,14 @@
        {--ADMIN_LIST_NETWORK_REFERRAL_LINK_NOTICE--}
 </div>
 
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_data&amp;do=change_networks%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_data&amp;do=change_networks%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
                        <strong>{--ADMIN_EDIT_NETWORK_DATA_TITLE--}</strong>
                </td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
@@ -18,7 +18,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 0d767fa247c8ce8b14baa79293bdc002ef555097..c35b230698deb1841425b7dbc05591856562bd7f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=payments&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 692f8c4ac90595b2ada1bf24a4ad872e89f4f452..7e51ccb915b1f07f27642f423af444037b52272e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_payouts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 5c106837c4287a280361b38115764c7c339ec8b1..a725ec3c32e71a1936fa4c3436fcc1d75fff19a0 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_point_accounts&amp;do=edit_points_data%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_point_accounts&amp;do=edit_points_data%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 1a608bb6dcec7333358e625c70b417a738fb659f..9e7abcdf458b39febd38398666bfa46987c88f9b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -28,5 +28,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 06cbb1fdb7c75bb28f6f5ef095301fea375021c4..e75368da99bde00903988ee03559440181075ac1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_rallyes%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallyes%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index e0acd57de2b9d385e27bc3d0108f5c719d242c7c..8de197bfe6bcbd25c1faa87464db78826c04919d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=refbanner&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 089e0c41c611512ea273056de8acf58ae1f3ca74..21384def7babba4bca679ac19616887fa12dc2e6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="550">
        <tr>
                <td align="center" colspan="2" class="bottom table_header">
@@ -14,5 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3d8714112fc7274a22440c1896e06ac49cb2c224..af7caa0c08d35ee055ee4922ce46aec7af650078 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;do=add_points&amp;id=$content[id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_sponsor&amp;do=add_points&amp;id=$content[id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
@@ -22,5 +22,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b5b66d4d3d7601e68c2ee626c9116ce45f248689..db9a033bd0fc47148b0dbdb2936ad42fc81b10a4 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;do=edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
 <tr>
        <td colspan="2" align="center" class="table_header bottom">
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index f91e691937cf04a892510f7dd1e92416292f4501..8249e177b6833f4f6a79cbef3eaedc18f17a2ee7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;do=sub_points&amp;id=$content[id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_sponsor&amp;do=sub_points&amp;id=$content[id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
@@ -22,5 +22,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 4954f4ed11ccf29f1a3295b898d6ebca70a42e94..12f415b99df6b7e9461c90152a727981b0639120 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_actions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_actions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="2" class="table_header bottom">
@@ -14,7 +14,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 7280cc83430e38e194551267ba56e340fd847f5f..20b60155c3137e3f12fffa96380e7126678e97a8 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="2" class="table_header bottom">
@@ -14,5 +14,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d63738578527f5d71d30772d30ebfcb84373f719..fb78af09368bd07c0cdf553c13417984034a5055 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=theme_edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=theme_edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" class="table_header">
@@ -23,7 +23,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="notice">
        {--ADMIN_EDIT_THEME_NOTICE--}
index eb0faf4ae592534f605ec30ef4426e5546be5a5e..f4be578df92343352ac3af9eaafc195790a9324b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=edit_user&amp;userid=$content[userid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=edit_user&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -78,5 +78,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 46cc96949012cd2ad09cf706ec98a3e52a8d6267..43c4e57f96fe4c7732c27149d0ca0a0ccb40a3cd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid%}&amp;userid={%get,bigintval=userid%}&amp;do=edit_user_subids" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_user_subid&amp;userid=$content[userid]&amp;do=edit_user_subids%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="3" class="table_header">
@@ -11,7 +11,7 @@
        <td class="header_column bottom right" align="center"><strong>{--SUBID_VALUE--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--SUBID_ADDED--}</strong></td>
 </tr>
-$content
+$content[rows]
 <tr>
        <td class="table_footer" colspan="3">
                <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
@@ -20,5 +20,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 923b446c80beaa2cea9c7f6ef929387b3daa7abc..b82ad00371622c6ec057d9611cbdd4ff4b949aec 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?dummy=1%}&amp;{%server,query_string%}" method="post">
+{%form,formMethodPost,serverQuery_String=modules.php?dummy=1%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--ADMIN_EXPERT_SETTINGS_TITLE--}:</strong>
@@ -16,5 +16,5 @@
                <input type="submit" class="form_submit" name="ok" value="{--ADMIN_EXPERT_SETTINGS_CONTINUE--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 194b64eeb6186e18e723092e44d108f941f7fe7e..14b00f67eed6380d4600d416c35f5db074d22f8f 100644 (file)
@@ -1,4 +1,4 @@
 <a name="ext_$content[ext_name]"></a>
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=extensions&amp;register_ext=$content[ext_name]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=extensions&amp;register_ext=$content[ext_name]%}
        <input type="submit" class="form_submit" name="ok" value="{--ADMIN_REGISTER_EXTENSION--}" />
-</form>
+{%form_close%}
index 96c525a1b8fbbe5699dcffa4ff95b7a31f7abbec..b9fb948ac9b3cf3febd3758132fa4c17e234da9e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
+{%form,formMethodGet=modules.php%}
 <input type="hidden" name="module" value="admin" />
 <input type="hidden" name="what" value="$content[what]" />
 <div class="table dashed">
@@ -17,5 +17,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_DO_ACTION--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 5d091e2bf41382c587b0db9bd57484d7da5354c5..2f5a2e1f4a6e2c0468dd0641e4251802b7057c64 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="4" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 91936319f01a063c06929efa9f42e775e8c32b4d..f77491c0d34adf13000ce51ae7c2f3391ce464ab 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=theme_import%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=theme_import%}
        <input type="hidden" name="theme" value="$content" />
        <input type="submit" class="form_submit" name="ok" value="{--ADMIN_INSTALLER_THEME--}" />
-</form>
+{%form_close%}
index 45f14c9266b8c386d4f2c7ce4e96f924ba771ffb..4c59a954814566a6326c6e8d222e79d7c53a83f5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=admins_edit%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=admins_edit%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -22,5 +22,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 893e55a63c23a9667e2fa90b6eac08a75e5987dd..4c7007ff99c90f2cb1670bdad58fa13f414655ba 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_admins_acls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -22,5 +22,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 29aef880567bae27f3046b6738861e81f2174376..e32822e7b7038cbef5f35f058071f899c859bb38 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_bank_package%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_bank_package%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="8" align="center" class="table_header">
@@ -25,5 +25,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 0540ebfb09de7c0d67b0fe83003cd59ae5c830d5..aa893f3e9127760ddbf3f93d09ab2d03820c7a30 100644 (file)
@@ -1,6 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_beg%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_beg%}
        <input type="submit" name="withdraw" class="form_submit" value="{--ADMIN_BEG_WITHDRAW_NOW_SUBMIT--}" />
-</form>
+{%form_close%}
 
 <div class="notice">
        ({--ADMIN_BEG_WITHDRAW_NOTICE--})
index 66f40771b85d0f4b5123f569c40459b3d3be8004..031e74d250475d756949c2406f204ea61efbe2df 100644 (file)
@@ -1,6 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_bonus%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_bonus%}
        <input type="submit" name="withdraw" class="form_submit" value="{--ADMIN_BONUS_WITHDRAW_NOW--}"/>
-</form>
+{%form_close%}
 
 <div class="notice">
        ({--ADMIN_BONUS_WITHDRAW_NOTICE--})
index 838f346702ea1063305c326b0d79f416e833fa74..ff38ce325f1668e8e58c508705d2d6d3eb72d182 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_booking%}&amp;userid={%get,bigintval=userid%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_booking&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="7" class="table_header bottom" align="center">
@@ -29,7 +29,7 @@
                <strong>{--BOOKING_COMMENTS--}</strong>
        </td>
 </tr>
-$content
+$content[rows]
 <tr>
        <td colspan="7" class="table_footer" align="center">
                <input type="hidden" name="booking_id[0]" value="1" />
index 24b68aab1565a2de0b8ef045700f4e694d529495..674a0be70e9b4072337f91142f9173c996bddb50 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_cats%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="4" class="table_header bottom">
@@ -21,5 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ff02f1d2b5567b14fe529c9f31cb49fdfd9d9d5b..49ebc49f34162b2a6692144afac78f679607b41e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_country%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_country%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -22,7 +22,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div align="center">
index edea805165a7ec41e1edd3782aba878c6722cabf..ec460aa1a061b9c3d1f0128bf1a0fab32266234c 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_country%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_country%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -19,4 +19,4 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
index eebd37c46363c4d9365d8141c67efdb73929c2bd..4d3e02cdc2241325a80bfdbb2112e89b60d521d3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_email_max_rec%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="3" class="table_header">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d1b5a5bbb628eeb212997f5e222e0501b1f8de17..d7c4a98f2159ebb7c366d8e733dfcab92e29073f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=extensions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -23,5 +23,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3ef143f0b8a27a6dbc13eaa0eaec2ab5b610baf6..14fe499fbd3a614cf23855f9fd15665de656f1c5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_ads%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_ads%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="6" class="table_header">
@@ -23,5 +23,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index dc97e8e17bee9a335c83f5d2de7a23ab050b5a1b..b329f3ec192c688713f5cdfc26c18fe985f70362 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_campaigns%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_campaigns%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="11" class="table_header">
@@ -30,7 +30,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 5f34c5019881e1bd6e1d7cf3c9a41bbb76a35178..ef0bca650e47866dad67135014eb3b55ca5a995b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_forced_costs%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_forced_costs%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="4" class="table_header">
@@ -21,5 +21,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 90d5f79958888915ba01d20805f3b8b422603644..d43a527ff729d532737feb80611bba3f94a6f7db 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=del_holiday%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=del_holiday%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td width="10" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
@@ -18,5 +18,5 @@
                        value="{--ADMIN_HOLIDAY_STOP_CHECKED--}" /></td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ea3fc2007f40ca7015f871d6cafad90bf13e8090..d02bc2b148031061570ccce6ffca95f90c3e46a6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_imprint%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_imprint%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="3" align="center" class="table_header">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 799a934941e4a71cada0fb0b585136b36cbcbda1..f615632472d238ba160df6883de30c694f6785cb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_mods%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_mods%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="7" class="table_header bottom" align="center">
@@ -23,7 +23,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 051faef6ffac61ae741d9113c923a1629beae286..26cd4246a8998a7052ff9a2a263dc4c77cde7e53 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=handle_array_translations%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=handle_array_translations&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -17,7 +17,7 @@
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--}</strong></td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="6" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
-       <a href="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=export%}&amp;network_id={%get=network_id%}">{--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--}</a>
+       <a href="{%url=modules.php?module=admin&amp;what=list_network_array_translation&amp;do=export&amp;network_id=$content[network_id]%}">{--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--}</a>
 </div>
 </div>
 
index 6a0d15c0e0b778920ea073f3e476dfcc6cc65b76..e7ae683a07d9256f578fbaa7986f82b8948de276 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_data&amp;do=handle_networks%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_data&amp;do=handle_networks%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="8" class="table_header">
@@ -32,7 +32,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
        <a href="{%url=modules.php?module=admin&amp;what=list_network_data&amp;do=export%}">{--ADMIN_EXPORT_ALL_NETWORK_DATA_LINK--}</a>
index f568b334a90d0f28b618d8dd9ff0c8d50eb5e2f9..50fcc5a10e5f98523010121198705624998c2bcf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=handle_request_params%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_request_params&amp;do=handle_request_params&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom">
@@ -18,7 +18,7 @@
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}</strong></td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
-       <a href="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=export%}&amp;network_id={%get=network_id%}">{--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--}</a>
+       <a href="{%url=modules.php?module=admin&amp;what=list_network_request_params&amp;do=export&amp;network_id=$content[network_id]%}">{--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--}</a>
 </div>
 </div>
 
index 136d9863b6bd86ace40ad54471b06ec2ebda4127..68687cc0f8d1eaf691b3d6a8f467448174617ea3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_types%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_types&amp;do=handle_network_types&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="7" align="center" class="table_header bottom">
@@ -20,7 +20,7 @@
                <td align="center" class="header_column bottom right"><strong>{--TIME_UNIT--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_TYPE_HANDLER_TEXT_ENCODING--}</strong></td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="7" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
-       <a href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=export%}&amp;network_id={%get=network_id%}">{--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--}</a>
+       <a href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;do=export&amp;network_id=$content[network_id]%}">{--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--}</a>
 </div>
 </div>
 
index 21ca47b3e1f0ce528fd41d414e1ef0905f828403..d81d211bfbcfc3e1d7b0c81ef97d8768c258ad4c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=handle_vcheck_params%}&amp;network_id={%get=network_id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=handle_vcheck_params&amp;network_id=$content[network_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header bottom">
@@ -17,7 +17,7 @@
                <td align="center" class="header_column bottom right"><strong>{--ADMIN_NETWORK_VCHECK_PARAMETER_VALUE--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ADMIN_NETWORK_VCHECK_PARAMETER_DEFAULT--}</strong></td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="4" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
-       <a href="{%url=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=export%}&amp;network_id={%get=network_id%}">{--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--}</a>
+       <a href="{%url=modules.php?module=admin&amp;what=list_network_vcheck_params&amp;do=export&amp;network_id=$content[network_id]%}">{--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--}</a>
 </div>
 </div>
 
index 552bed5c471ff645c23312e0066fb3a4b0701f18..0240f22e6df4eb7f5c85e2e7515e5fd01ade47fe 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_nickname%}&amp;userid={%get,bigintval=userid%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_nickname&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="5" class="table_header">
@@ -13,7 +13,7 @@
        <td class="header_column bottom right" align="center"><strong>{--ENTRY_ADDED--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--ADMIN_HISTORY_ENTRY_LAST_USED--}</strong></td>
 </tr>
-$content
+$content[rows]
 <tr>
        <td class="table_footer" colspan="5">
                <input type="hidden" name="history_id[0]" value="1" />
@@ -22,7 +22,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index e8e12ba44009d8fbe133e0a7565d2a23a3472268..23afb8f96526e3a799793d8b70ac12a7c5e5c98f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=payments%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=payments%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="5" class="table_header">
@@ -22,5 +22,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a50ed1416d6a20dc3a7281e2273385128d6ce043..794a6bba95d9e8c381f9f2aaca57bcd4dfb513b9 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_payouts%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_payouts%}
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" align="center" class="table_header">
                        <strong>{--ADMIN_LIST_PAYOUTS--}:</strong>
@@ -20,4 +21,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
+</div>
index 05b7c892f662c539fb80fc5d4c5bb15d5f1c26a3..3095ea22b25fccf9153ee033623ef81785c2fd16 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_point_accounts%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_point_accounts%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="7" class="table_header">
@@ -24,5 +24,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 61e6231c3eb71d5349844e47bc66a2f7ad7eeb02..8701caf40d2baca66ca8f8f674b70d43718eb29d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye_id=$content[rallye_id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="4" align="center" class="table_header">
@@ -29,5 +29,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d72b52b0cfdee3fa4705ba60b1cabaf579dc5e64..7873f7668ca11708881a5e1929b51d87d35fb052 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_rallyes%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_rallyes%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" align="center" class="table_header">
@@ -19,7 +19,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 7991ed207302b30cce759840f864227e5f892b2a..781d46d53fcab8d31595ee87a5e866db9fce7daf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=refbanner%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=refbanner%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="6" class="table_header bottom">
@@ -23,5 +23,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 5c7f5fef7d0108ba5ab4b1f4cd4a4c4b94d1e51e..7f9f5da6aa08cdf947e1b85c255702248c5faebf 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=config_points&amp;sub=ref%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="3" class="table_header">
@@ -20,7 +20,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 23c784a0394f3858f58c0b17386414937cd437c1..03cb6e1a2585d1c6d81f2e0a7ae803cad478c573 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_server_name%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_server_name%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="6" class="table_header">
@@ -22,7 +22,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 59c0f631e78912b2cadef0c298afc2da3b25d213..6a1fb9d8f11c35737ff74d051dbc4c5ffc45c86c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_sponsor%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
 <tr>
        <td colspan="4" align="center" class="table_header bottom">
@@ -13,5 +13,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index c1658963fff8ef338823bc36dbce4e4c63f40be8..6d06c00b2d8216e8e4d5baaad0ce7f2add12bace 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor_pay%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_sponsor_pay%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
 <tr>
        <td colspan="5" align="center" class="table_header bottom">
@@ -22,5 +22,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index bfd7d84b19ce0d2e923fb773c9db96f42574631a..5bac03e90f7377f242ad3130d9b520f3ada0628a 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor_pay%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_sponsor_pay%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="640">
 <tr>
        <td align="center" colspan="5" class="table_header bottom" height="40">
@@ -21,5 +21,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 8c9c71a41d8e5176af56d0ef3be5f647ceaf13e3..853d1e6a4abf4f984dd05257988020bd450e7008 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor_pay%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_sponsor_pay%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="640">
 <tr>
        <td align="center" colspan="5" class="table_header bottom" height="40">
@@ -21,5 +21,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index b7eeb9fb21ae30e07af4480e1817eee84692f190..98985d31ee9f84ed1338cbaa447954ab1ce4728f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_actions%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_actions%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="600">
 <tr>
        <td colspan="4" class="table_header bottom" align="center">
@@ -28,7 +28,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 3a9ee6ea7fc0f8e272dc91c8925cbbb6b88361f9..77b2f54b0c9f1254a5850e2ce415a51b7a4627ea 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="10" class="table_header">
@@ -29,5 +29,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d180e3baa0425e8c24e024e5eecea85f39c1a0c3..15ec420d5df4adf71f49578e6794cfe9f53c397b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_task&amp;type=$content[type]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_task&amp;type=$content[type]%}
 <table border="0" cellspacing="0" cellpadding="0" class="admin_tasktable dashed">
 <tr>
        <td colspan="7" align="center" class="admin_task_header bottom">
@@ -26,5 +26,5 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 4ffec561ca0e1165c05cc545e2e858862d77ebd2..eca5de334e17151900cdc07856419ff5f554ec7f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_task&amp;type=$content[type]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_task&amp;type=$content[type]%}
 <table border="0" cellspacing="0" cellpadding="0" class="admin_tasktable dashed">
 <tr>
        <td colspan="7" align="center" class="admin_task_header bottom">
@@ -26,7 +26,7 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index dc5b684d07884fe01ae9c22213879227ad093e75..5c0eebf45d5a784f6fdc2da377a256318bef0c02 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=del_transfer%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=del_transfer%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" align="center" class="table_header bottom">
@@ -41,5 +41,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 47d89b3b557f3f25ee541fe12c3399decdfc8262..557ad3709ac52bc74a21192cbf5e7512e4ab3993 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid%}&amp;userid={%get,bigintval=userid%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_user_subid&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="800">
 <tr>
        <td align="center" colspan="4" class="table_header">
@@ -12,7 +12,7 @@
        <td class="header_column bottom right" align="center"><strong>{--SUBID_VALUE--}</strong></td>
        <td class="header_column bottom" align="center"><strong>{--SUBID_ADDED--}</strong></td>
 </tr>
-$content
+$content[rows]
 <tr>
        <td class="table_footer" colspan="4">
                <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
@@ -22,5 +22,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index ebd257117458c4b771e5402a3ed1ed9bc63b1a43..3ef4db18ba505caa940acfa8027dbdd45e96eb67 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_user_subid&amp;do=stats%}&amp;userid={%get,bigintval=userid%}&amp;id={%get,bigintval=id%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_user_subid&amp;do=stats&amp;userid=$content[userid]&amp;id=$content[id]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="6" align="center" class="table_header bottom">
@@ -14,7 +14,7 @@
                <td align="center" class="header_column bottom right"><strong>{--USER_AGENT--}</strong></td>
                <td align="center" class="header_column bottom"><strong>{--ENTRY_ADDED--}</strong></td>
        </tr>
-       $content
+       $content[rows]
        <tr>
                <td colspan="6" class="table_footer">
                        <input type="hidden" name="subid[0]" value="{%get,getSubId=id%}" />
@@ -23,7 +23,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 844b99f157374a7818382ab5fda9451697f86719..04f57c5c5d07a165b6f58a18c534648d168ab715 100644 (file)
                <tr>
                        <td align="center">
                                $content[already]
-                               <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_yoomedia_tm%}" method="post">
+                               {%form,formMethodPost=modules.php?module=admin&amp;what=list_yoomedia_tm%}
                                        <input type="hidden" name="id" value="$content[id]" />
                                        <input type="hidden" name="reload" value="$content[reload]" />
                                        <input type="submit" class="form_delete" name="unlist" value="{--ADMIN_YOOMEDIA_UNLIST_MAIL--}" />
-                               </form>
+                               {%form_close%}
                        </td>
                </tr>
                </table>
index 15efee514b431b1998306dc103c6a543374473cb..09e7f91dab5ad73f17578f681d8cb5fbac22af46 100644 (file)
@@ -6,7 +6,7 @@
        <td class="{%template,ColorSwitch%} bottom right" align="center">{%pipe,translateComma=$content[remain]%}</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[pay] &euro;</td>
        <td class="{%template,ColorSwitch%} bottom" align="center" style="padding-left:1px;padding-right:1px;padding-top:2px;padding-bottom:2px">
-               <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_yoomedia_tm%}" method="post">
+               {%form,formMethodPost=modules.php?module=admin&amp;what=list_yoomedia_tm%}
                        <input type="hidden" name="id" value="$content[id]" />
                        <input type="hidden" name="name" value="$content[name]" />
                        <input type="hidden" name="wait" value="$content[wait]" />
@@ -18,6 +18,6 @@
                                <td><input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_YOOMEDIA_REMOVE_MAIL--}" /></td>
                        </tr>
                        </table>
-               </form>
+               {%form_close%}
        </td>
 </tr>
index 4d5f0552773716bb4bb0b055c192be93e5007e00..69472795969cc52103a2f4a0f5ebbce6642efd88 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]%}" method="post">
-<div align="center" class="table dashed">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=lock_sponsor&amp;id=$content[id]%}
+<div class="table dashed">
 
 <div class="table_header bottom">
        <div class="table">$content[header_message]</div>
@@ -23,4 +24,5 @@
 </div>
 
 </div>
-</form>
+{%form_close%}
+</div>
index 1eedfe6c2572698baba569482ca41a7ffe94a480..55d5bad87cbd4acdd520e02163e688b87e0479a1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="5" class="table_header">
@@ -21,5 +21,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index cb357a8e256b5206315de0d764e06575ad8e1af2..d3b5df316097c34a02c9a7666b922f8b1659c8f4 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=lock_user&amp;userid={%pipe,bigintval=$content[userid]%}%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=lock_user&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
@@ -26,5 +26,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 68b515f593e77e93e0efe821834fb101cacadee7..c0a4c27a241e2660f1440953ac92f4fa6308c357 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?$content[all_parameter]%}" method="post">
+{%form,formMethodPost=modules.php?$content[all_parameter]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -57,5 +57,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 28079ad0156877d6f4c132fff64e27de0b89273e..c43caaed8a44d77fdf28b29e584e43a969f0b6eb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;action=logout%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;action=logout%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom">
@@ -23,5 +23,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 49c04cb3afb83aff1988783cd9aeeb393a7f2ac6..3fd950e83d5c7f0dbc79f6cafa4495c5f19e94c2 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=maintenance%}" method="post">
-<div class="table dashed" align="center">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=maintenance%}
+<div class="table dashed">
 
 <div class="table_header bottom">
        {--ADMIN_MAINTENANCE_MODE_INTRO--}
@@ -14,4 +15,5 @@
 </div>
 
 </div>
-</form>
+{%form_close%}
+</div>
index 4969cc076869ba4931f7a62e4bff6ad8dfbd9b92..ad352f9571c3485870e3b63bbcd7e5b35f718d90 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="header_column bottom right" align="center" width="5%"><strong>{--ID_SELECT--}</strong></td>
@@ -18,5 +18,5 @@ $content[rows]
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 722ef9ad4be88e43e29187da6f1a25df789d59ca..dec253da05f8e70514fede8f53a0f27dc6e7cd47 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=memedit&amp;sub=$content[sub]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="4" class="table_header bottom">
@@ -18,5 +18,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 528cac31fcf861c5de11af9a2d4ec30f3aca4fce..943b2f92ad9c28775aeecd66aefc75c98c66b27e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_newsletter%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=send_newsletter%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
@@ -61,7 +61,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="notice">
        {--ADMIN_NEWSLETTER_NOTICE--}
index e32864501c1b68da130abca698ad563062a4e6ff..7d5cdab0fa64e539ddfbd5b4f1beeb103e5876d9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_newsletter%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=send_newsletter%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center" width="430">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
@@ -43,7 +43,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index d0791c2cbe58e532cb3b2c054f28e490800e65b8..2f3eb97980ec22eeb2ee816b7f9f335f19da55dc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin%}" method="post">
+{%form,formMethodPost=modules.php?module=admin%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="7" align="center" class="admin_task_header bottom">
@@ -26,5 +26,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 3554a90264d4d0bd7a5bbd2d96f84fbf267e445f..10612118f32e43969bd7a325d6e4bd7c13ffad99 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=$content[pid]&amp;task=$content[task]%}" method="post">
-<div align="center" class="table dashed">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=$content[pid]&amp;task=$content[task]%}
+<div class="table dashed">
 
 <div class="table_header bottom">
        <strong>{--ADMIN_PAYOUT_ACCEPT_PAYOUT_INTRO--}</strong>
@@ -21,4 +22,5 @@
 </div>
 
 </div>
-</form>
+{%form_close%}
+</div>
index 6567c8edaf688d78ab3b6e139725ef707cf95dd0..cad004280d0739d70752ef5481733bc68b8ced0b 100644 (file)
@@ -1,7 +1,7 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=$content[pid]&amp;task=$content[tid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=$content[pid]&amp;task=$content[tid]%}
        <input type="submit" class="form_submit" value="{--ADMIN_PAYOUT_ACCEPT_PAYOUT--}" />
-</form>
+{%form_close%}
 <br />
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=$content[pid]&amp;task=$content[tid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=$content[pid]&amp;task=$content[tid]%}
        <input type="submit" class="form_delete" value="{--ADMIN_PAYOUT_REJECT_PAYOUT--}" />
-</form>
+{%form_close%}
index 3fbc8df7164921adce201f152b6d5772942f69d4..85a5d59e70a009b09bc3bd02ffeb212cf35dc612 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=$content[pid]&amp;task=$content[task]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=$content[pid]&amp;task=$content[task]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td class="table_header bottom" align="center">
@@ -23,5 +23,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d7c3e03ad165a315289f7a92004f044aeafeab7a..b961107b05512d892fef5ced6c8a75457be66987 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin%}" method="post">
+{%form,formMethodPost=modules.php?module=admin%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom" height="29">
@@ -35,5 +35,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 7633e67c21d00e0686f4b4ab8072582e1ba669ab..cbb29a98f0728bfa0932664ce75b28cf03a58b3c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;reset_pass=1%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;reset_pass=1%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2">
@@ -21,7 +21,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 519d23047572340125d4042d9af877d874fe4642..626eb4e870f7e656dfe6b5c53c8f81975b1a041b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;reset_pass=1%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;reset_pass=1%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2">
@@ -40,7 +40,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 7da12192551d7846a4b516467afc760c5c7f46f0..454b00c4c4920c124f18a4f09bb7989bac283031 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;reset_pass=1%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;reset_pass=1%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2">
@@ -21,7 +21,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 223dfc399b2c95bcd1ce327698f87f8c43bb3fd7..2f26a74dc3be5894dc69bdbdb3b996ee58f3da4b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_bonus&amp;mail_mode=$content[mail_mode]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=send_bonus&amp;mail_mode=$content[mail_mode]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
@@ -60,5 +60,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 289bef2a986ce2a1c9dcaa0f91fa50182770292d..065cfe6a6434cc2ba9fe6cfa8a7251c71f2dde71 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=send_coupon%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=send_coupon%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
@@ -32,5 +32,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d05d2e927c8316e0c5906e0a78726607033b267c..1f8f14b4d39bfbe7e240e0e95e5c3ee1d513b271 100644 (file)
@@ -1,5 +1,6 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_yoomedia_tm%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_yoomedia_tm%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="2" class="table_header bottom">
                <strong>{--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--}</strong>
@@ -67,4 +68,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
+</div>
index 334a8241348e394247733520a87e720522a1374e..76900e8d1c318062dfe6d0ef015aeda31557dfc4 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php%}" method="get">
+{%form,formMethodGet=modules.php%}
 <div class="dashed">
        <div class="table_header bottom">
                <strong>{%message,ADMIN_SHOW_CONFIG_NETWORK_HANDLER_TYPE_TITLE=$content[network_type_handler]%}</strong>
@@ -38,5 +38,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 9363bff2649b4e195895b50e34d51b8853232501..374bb4c50dcf501a3f25b8d58a45ea274b445531 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=sub_points&amp;userid=$content[userid]%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=sub_points&amp;userid=$content[userid]%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header" colspan="2" align="center">
@@ -33,5 +33,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 309a1ba8bfc153ce0154cda4dfdb38b8ec97fbfe..c4c973b4397da7ee2dbd87cb7e05af1f53adf2f1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=sub_points&amp;userid=all" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=sub_points&amp;userid=all%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" colspan="2">
@@ -29,5 +29,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 173ac2ca3c39bb5b8ce3690b1049be5b20573ce0..4ce5c1d10f5aece8a881b6d7fc62a222eeba9501 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=list_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" colspan="4" class="table_header">
@@ -20,5 +20,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 9c3a84d52089f8660094466f529a9b72756409d4..f23ff2cab26456b11d26c30f56a16fe78986ebec 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" actiom="{%url=modules.php?module=admin&amp;what=unlock_emails%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=unlock_emails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="99%">
        <tr>
                <td colspan="8" align="center" class="table_header bottom" height="35">
@@ -31,5 +31,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 89274564d6308a8f4f7a178d9b469ed2506d2a25..bbbf49d34c9755d4c976f6abfea75ad9d75a26b3 100644 (file)
@@ -1,4 +1,5 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=unlock_emails%}" method="post">
+<div align="center">
+{%form,formMethodPost=modules.php?module=admin&amp;what=unlock_emails%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center" height="35">
@@ -13,4 +14,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
+</div>
index 02b2269a5f649276012083d838fb211050626e8f..f38d83fea8887c88020ed93118c225f3dba9ca3e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=unlock_sponsor%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=unlock_sponsor%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td colspan="4" class="table_header bottom" align="center">
@@ -20,7 +20,7 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 442f4de3d0cdb816b676d831c2d43f0aa18fed8f..ac963d53d8aac59a946f53e3c63c1fdd6cff9302 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=unlock_surfbar_urls%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;what=unlock_surfbar_urls%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="600">
 <tr>
        <td align="center" colspan="5" class="table_header">
@@ -22,5 +22,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a41c9e1482e8a97b9fed2b3e9c0375dbf3c5044c..c83007d15f9faa0e20412ed4ba82661e45843536 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;reset_pass=1&amp;hash=$content%}" method="post">
+{%form,formMethodPost=modules.php?module=admin&amp;reset_pass=1&amp;hash=$content%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2">
@@ -23,7 +23,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 276b7e8cb26d4bae6bf6667b756ff3b83dd1c799..3faca827ca135bd63f2daa002e9443fe36556981 100644 (file)
@@ -10,7 +10,7 @@
                $content[enter_login]<br />
                {--DOUBLER_NOTICE_FOR_PASSWORD--}<br />
                <br />
-               <form accept-charset="UTF-8" action="{%url=doubler.php?refid=$content[refid]" method="post">
+               {%form,formMethodPost=doubler.php?refid=$content[refid]%}
                <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
                        <tr>
                                <td colspan="2" class="table_header bottom">
@@ -53,7 +53,7 @@
                                </td>
                        </tr>
                </table>
-               </form>
+               {%form_close%}
                <br />
                {--DOUBLER_ALREADY_PAYED--}<br />
                {--DOUBLER_POINTS_LEFT--}<br />
index 61103a266f4ea7ca82692708ca3b370549dd9d14..4f1407d618acce444dac0a35443739af016011cb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=confirm%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=confirm%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -24,5 +24,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 7f7b91a8a0cbfb74fca6ee40b31e27f20955d697..a70e7dd0854744d62afd23c02cbb713c002f9d7c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=login%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=login%}
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="480">
        <tr>
                <td colspan="4" class="guest_login_header" align="center">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=login%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=login%}
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed">
        <tr>
                <td colspan="2" align="center" class="guest_login_header">
@@ -77,5 +77,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index d5de22098c3f7977c533c1d54aea5fa7e7d91bca..9809131aaf356a9f25dccc2f26a6ee34fd98e42b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=login%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=login%}
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="540">
        <tr>
                <td colspan="4" class="guest_login_header" align="center">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=login%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=login%}
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed" width="540">
        <tr>
                <td colspan="2" class="guest_login_header" align="center">
@@ -77,5 +77,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index fd09971bbfc37f80dee42b647253a760dd2138df..501249615cacee1c992bb9692f773785b0c0d183 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=register%}" method="post" name="register">
+{%form,formMethodPost,formNameRegister=modules.php?module=index&amp;what=register%}
 <table border="0" cellspacing="0" cellpadding="0" width="640" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom">
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 30e811df5b730c7b3f6572a9bdc2fbc41c15eeca..b2bc442c198757fbe4f93c6ebe46ec69491637de 100644 (file)
@@ -1,6 +1,6 @@
 <div class="para">
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=activate%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=sponsor_login&amp;do=activate%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="400">
 <tr>
        <td class="table_header bottom" align="center" colspan="2">
@@ -22,7 +22,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 </div>
 
index 40f97de163d348e72dbf34239706b3c1653509fc..a13229152da38db1546e8b24fe4e823498ca1158 100644 (file)
@@ -1,6 +1,6 @@
 <div class="para">
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=sponsor_login%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="table_header bottom" align="center" colspan="2">
@@ -30,7 +30,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 </div>
 
index 78b5c9c4a39e29aa398560f966e49b729ccb68dc..244f44a5c82b6cb63bb744c956c00542d9eb5c76 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_login&amp;do=lost_pass%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=sponsor_login&amp;do=lost_pass%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="400">
 <tr>
        <td class="table_header bottom" align="center" colspan="2">
@@ -29,7 +29,7 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div align="center">
index b4c5a9bc58251195bc3decac4bc46a81dc08b06a..97908bc1fef95c700b052060e7e2f1e1fd6d8de3 100644 (file)
@@ -13,7 +13,7 @@
 </div>
 
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=index&amp;what=sponsor_reg%}" method="post">
+{%form,formMethodPost=modules.php?module=index&amp;what=sponsor_reg%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" width="530">
 <tr>
        <td class="table_header bottom" colspan="2" align="center">
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 67589c66a6d93b8851f518bbf624a4c1f0aaacb5..0148839317762a5e9b84170e1765b2fdfbd33b97 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="UTF-8" action="{%url=install.php?install_page=2%}" method="post">
+{%form,formMethodPost=install.php?install_page=2%}
 <table border="0" cellspacing="0" cellpadding="0" class="install_content">
 <tr>
        <td align="center" class="install_title">
@@ -23,4 +23,4 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
index c209634e5d999d67784836ca0c910be66e18d4ad..583b50394b67faa4df092acd147f8a69546c6744 100644 (file)
@@ -7,8 +7,8 @@
        {--INSTALLER_FIN_SECU--}
 </div>
 
-<form accept-charset="UTF-8" action="modules.php" method="get">
+{%form,formMethodPost,formTarget_self=modules.php%}
        <input type="hidden" name="module" value="admin" />
        <input type="submit" class="form_submit" value="{--INSTALLER_CONTINUE_ADMIN--}" />
-</form>
+{%form_close%}
 </div>
index fd79c54e95b9b2cf5e98a4e696ecb41530769045..22c966f4a5edda4695f64a8e679472c46090026d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom:10px">
-<form accept-charset="UTF-8" action="{%url=install.php?install_page=2%}" method="post" target="_self">
+{%form,formMethodPost,formTarget_self=install.php?install_page=2%}
 <table border="0" cellspacing="0" cellpadding="0" class="install_content">
        <tr>
                <td colspan="2" align="center" class="install_title">
@@ -37,5 +37,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 92e29759f28f9daf8c83c2ef07273af4924ae2e6..9b1d8b5f0ede4245abb95d3a4946198d86dd320d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom:10px">
-<form accept-charset="UTF-8" action="{%url=install.php?install_page=3%}" method="post" target="_self">
+{%form,formMethodPost,formTarget_self=install.php?install_page=3%}
 <table border="0" cellspacing="0" cellpadding="0" class="install_content">
        <tr>
                <td colspan="2" align="center" class="install_title">
@@ -67,5 +67,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 844ee53b85b7cc1dabc68e9952f5fa4b098c55f6..fdedb163287d108b765ca84f89875c2dd2acf1b9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom:10px">
-<form accept-charset="UTF-8" action="{%url=install.php?install_page=5%}" method="post" target="_self">
+{%form,formMethodPost,formTarget_self=install.php?install_page=5%}
 <table border="0" cellspacing="0" cellpadding="0" class="install_content">
        <tr>
                <td colspan="2" align="center" class="install_title">
@@ -53,5 +53,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index e89367bb647b532854b059b1266e03297779ea6a..6934267b52e7bd250ec92f6c5125564ac8689168 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom:10px">
-<form accept-charset="UTF-8" action="{%url=install.php?install_page=finalize%}" method="POST" target="_self">
+{%form,formMethodPost,formTarget_self=install.php?install_page=finalize%}
 <table border="0" cellspacing="0" cellpadding="0" class="install_content">
 <tr>
        <td colspan="2" align="center" class="install_title">
@@ -62,5 +62,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index e662c2a0941a0947e13aed4171a2e10a8f5dd0bd..8d7685c38273398db59fdb08dcf1180cc441458d 100644 (file)
 
        <div align="center">
                <div style="float:left; width:38%">
-                       <form action="{%url=install.php%}" method="get">
+                       {%form,formMethodGet=install.php%}
                                <input type="hidden" name="installer" value="ajax" />
                                <input type="submit" id="ajax_installer" class="form_submit big disabled" disabled="disabled" value="Interaktive Version" />
-                       </form>
+                       {%form_close%}
                </div>
                <div style="float:left; width:23%; text-align:center">
                        <span id="counter">3</span> Sekunde(n)
                </div>
                <div style="float:left; width:38%">
-                       <form action="{%url=install.php%}" method="get">
+                       {%form,formMethodGet=install.php%}
                                <input type="hidden" name="installer" value="plain" />
                                <input type="submit" id="plain_installer" class="form_submit big" value="Kompatiblit&auml;tsmodus" />
-                       </form>
+                       {%form_close%}
                </div>
                <div style="clear:both"></div>
        </div>
index 6ecee3c338d1f74732371ce3799794d3909cf244..21a1612f3b6c6f6d87efe56392cc541ba98f9239 100644 (file)
@@ -39,9 +39,9 @@
 </div>
 
 <div class="install_footer">
-       <form accept-charset="UTF-8" action="install.php" method="get" target="_self">
+       {%form,formMethodGet,formTarget_self=install.php%}
                <input type="hidden" name="install_page" value="1" />
                <input type="submit" class="form_submit" value="{--INSTALLER_NEXT_PAGE--}" />
-       </form>
+       {%form_close%}
 </div>
 </div>
index fa74e28ed3e2384fc03288809c55175b706dd543..8ec8ffcc912f5c8bfacee7c224cdf9916bed5eab 100644 (file)
@@ -96,3 +96,4 @@ function resetForm () {
 }
 
 focusLimitedNo();
+document.getElementById('url').focus();
index 74f71b7edfffda9c6c17805ef1dc6b91c73ed50f..b4e3edc1c5513a1780f95fd731fad0234836d276 100644 (file)
@@ -36,7 +36,7 @@ function restart () {
 }
 
 function showButton () {
-       buttonDiv.innerHTML = '<form accept-charset=\'UTF-8\' action=\'{%url=surfbar.php%}\' target=\'_self\' method=\'GET\'><input type=\'hidden\' name=\'frame\' value=\'top\' /><input type=\'submit\' id=\'form_submit\' value=\'Surfbar erneut starten\' /></form>';
+       buttonDiv.innerHTML = '{%form,formTarget_blank,formMethodGet=surfbar.php%}<input type=\'hidden\' name=\'frame\' value=\'top\' /><input type=\'submit\' id=\'form_submit\' value=\'Surfbar erneut starten\' />{%form_close%}';
 }
 
 function counter () {
index 9a33d61e56bc85b6bbf7d1ce4ad388a841851871..cdd2791d32f640d208b576011c638c383c8e9a9b 100644 (file)
@@ -2,11 +2,11 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       <form accept-charset="UTF-8" action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}" method="post">
+                       {%form,formMethodPost=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}
                                {--MEMBER_MAILID_CLICK_BUTTON--}:<br />
                                <input type="hidden" name="gfx_check" value="$content[gfx]" />
                                <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SUBMIT_CODE--}" />
-                       </form>
+                       {%form_close%}
                </td>
                <td align="center">
                        <div class="banner dashed">
index c838b191fc61afb04dd4016dd5f876803bd9773e..79cbc107f8740838f915d5ca1e0a353554d05c47 100644 (file)
@@ -2,15 +2,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       <form
-                               accept-charset="UTF-8"
-                               action="{%url=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}"
-                               method="post">
+                       {%form,formMethodPost=mailid_top.php?userid=$content[userid]&amp;$content[type]=$content[data]&amp;do=add&amp;code=$content[code]%}
                                        {--MEMBER_ENTER_CODE--}:
                                        $content[image]<br />
                                        <input type="text" class="form_field" name="gfx_check" size="5" maxlength="45" />
                                        <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SUBMIT_CODE--}" />
-                       </form>
+                       {%form_close%}
                </td>
                <td align="center">
                        <div class="banner dashed">
index f61e3206597a09708b0991eb65e21966b78c58f2..51417150e235295911f0089900872c92a8971818 100644 (file)
@@ -26,11 +26,11 @@ function startCounter() {
                <table border="0" cellspacing="0" cellpadding="0" class="form_submit dashed">
                        <tr>
                                <td align="center">
-                               <form accept-charset="UTF-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
+                               {%form,formNameConfirm,formMethodGet%}
                                        {--MEMBER_TIME_COUNTER_1--}
                                        <input type="text" class="form_field" name="counter" size="$content[tim2]" readonly="readonly" value="$content[time]" />
                                        {--MEMBER_TIME_COUNTER_2--}
-                               </form>
+                               {%form_close%}
                                </td>
                        </tr>
                </table>
index 633e37bbccb8bb55fa8f4b52b3243a66f1647ba6..bb45eb6522d6b6cd3c6de497b1b1409e66e801d6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=subids%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=subids%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--MEMBER_ADD_SUBID_TITLE--}</strong>
@@ -19,7 +19,7 @@
                <input type="submit" name="add_subid" class="form_submit" value="{--MEMBER_USER_SUBIDS_ADD_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index b34e1844789872135dd0444f357a5165658ab1cf..09ae7460b8383792c11461eb08696ac0326b619a 100644 (file)
@@ -1,12 +1,12 @@
 <div align="center">
-<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=book_surfbar%}" method="post" onsubmit="return submitForm()" onreset="return resetForm()">
+{%form,formIdBook,formMethodPost=modules.php?module=login&amp;what=book_surfbar%}
 <div class="table3 dashed" style="margin-top:10px">
        <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Dynamisch:</strong>
        </div>
 
        <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
+               URL eingeben: <input type="text" class="form_field" id="url" name="url" size="20" maxlength="255" value="http://" />
        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
        </div>
 
        <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="reset" class="form_reset" id="reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL_SUBMIT--}" />
        </div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"
- type="text/javascript"></script>
-</form>
+<script type="text/javascript" src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"></script>
+<script type="text/javascript">
+<!--
+$('#book').submit(function() {
+       return submitForm();
+});
+
+$('#reset').click(function() {
+       return resetForm();
+});
+//-->
+</script>
+
+{%form_close%}
 
 <span class="notice" style="padding:5px">
        Die maximalen Kosten bzw. Einnahmen pro Surfbaraufruf richten sich nach
index e7c712885250413cd3a5d736673143e6134e3e5a..ede62c0f329fafd404cb4c01f420808d67a453ec 100644 (file)
@@ -1,12 +1,12 @@
 <div align="center">
-<form accept-charset="UTF-8" id="book" action="{%url=modules.php?module=login&amp;what=book_surfbar%}" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">
+{%form,formIdBook,formMethodPost=modules.php?module=login&amp;what=book_surfbar%}
 <div class="table3 dashed" style="margin-top:10px">
        <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar buchen - Statisch:</strong>
        </div>
 
        <div class="member_input bottom" style="padding-top:5px;padding-bottom:5px">
-               URL eingeben: <input type="text" class="form_field" name="url" size="20" maxlength="255" value="http://" />
+               URL eingeben: <input type="text" class="form_field" id="url" name="url" size="20" maxlength="255" value="http://" />
        </div>
 
        <div class="member_input" style="padding-top:5px;padding-bottom:5px">
        </div>
 
        <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="reset" class="form_reset" id="reset" value="{--CLEAR_FORM--}" />
                <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SURFBAR_ADD_URL_SUBMIT--}" />
        </div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}" type="text/javascript"></script>
+<script type="text/javascript" src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"></script>
+<script type="text/javascript">
+<!--
+$('#book').submit(function() {
+       return submitForm();
+});
 
-</form>
+$('#reset').click(function() {
+       return resetForm();
+});
+//-->
+</script>
+
+{%form_close%}
 </div>
index d41bbe7f9189c98be2009709b5e771c9c180b1ec..626ce38cd3849ca42cdca5acd30c2ad2f3fa832f 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="cash_coupon" action="{%url=modules.php?module=login&amp;what=cash_coupon%}" method="post">
+{%form,formIdCash_coupon,formMethodPost=modules.php?module=login&amp;what=cash_coupon%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--MEMBER_CASH_COUPON_TITLE--}</strong>
@@ -16,9 +16,9 @@
                <input type="submit" class="form_submit" name="ok" value="{--MEMBER_CASH_COUPON--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 
-<form accept-charset="UTF-8" id="change_coupon_status" action="{%url=modules.php?module=login&amp;what=cash_coupon%}" method="post">
+{%form,formIdChange_coupon_status,formMethodPost=modules.php?module=login&amp;what=cash_coupon%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--MEMBER_COUPON_CHANGE_STATUS_TITLE--}</strong>
@@ -31,5 +31,5 @@
                <input type="submit" class="form_submit" name="change" value="{--MEMBER_CHANGE_COUPON_STATUS--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 7d3aae20960e1c4f4e52e62c2e01362bd69e0f23..60fa3e5ab80b331bbc076d381c85ced599015ab8 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=categories%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=categories%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td align="center" class="header_column bottom" width="408"><strong>{--CATEGORY_NAME--}</strong></td>
@@ -13,5 +13,5 @@ $content
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index a9680b73110fb1e12a2efd7e4f2b4ebe6e27f94e..8c917b4e7d85022f396efc2ff64fb5010d318cd4 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=subids&amp;do=delete_subids%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=subids&amp;do=delete_subids%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,7 +14,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index d378454bc789279aac2b4e9c234c20dcaefea4a3..b5e4e600fa200d04178195651bbdfed1800f99bd 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="earning_$content[earning_id]" action="{%url=modules.php?module=login&amp;what=earning%}" method="post">
+{%form,formIdEarning_$content[earning_id],formMethodPost=modules.php?module=login&amp;what=earning%}
 <div class="table dashed">
 <div class="table_header bottom">
        <strong>{%message,MEMBER_EARNING_POPUP_FORM_TITLE=$content[earning_provider]%}</strong>
@@ -18,5 +18,5 @@
        <input type="submit" class="form_submit" name="ok" value="{--MEMBER_EARNING_SUBSCRIBE_SUBMIT--}" />
 </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 210b63377fdc9f6b91061857688cd1eeb1f5e268..c1368cec61d31f41fd200f5e696ee52f9bf69f40 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="earning_$content[earning_id]" action="{%url=modules.php?module=login&amp;what=earning%}" method="post">
+{form,formIdEarning_$content[earning_id],formMethodPost=modules.php?module=login&amp;what=earning%}
 <div class="table dashed">
 <div class="table_header bottom">
        <strong>{%message,MEMBER_EARNING_POPUP_FORM_TITLE=$content[earning_provider]%}</strong>
@@ -24,5 +24,5 @@
        <input type="submit" class="form_submit" name="ok" value="{--MEMBER_EARNING_CHANGE_SUBMIT--}" />
 </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 1ff3037889ee6037ba896e1072e6269543385a44..0541a7e347c42ecc5f0283a3f5dd863188cce2cb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=refback%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=refback%}
 <input type="hidden" name="id" value="$content[id]" />
 <div class="table dashed">
 <div class="table_header bottom">
@@ -19,7 +19,7 @@
        <input type="submit" class="form_submit" name="edit" value="{--MEMBER_REFBACK_EDIT_SUBMIT--}" />
 </div>
 </div>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index c9c0fd75fbd5872b471347d53ebb2c1d4a5ea93d..857db6f5521b34cca751a7fad4aff7788ac9259e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=subids&amp;do=edit_subids%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=subids&amp;do=edit_subids%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" class="table_header bottom" height="25" colspan="4">
@@ -14,7 +14,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 611a7b96212977ff959190e2836303f8052cbbad..c2535df2ca543cc329c9473a4ff6628c0470117a 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=holiday%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=holiday%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="bottom table_header"
@@ -29,7 +29,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 1b4543fd3c94ceff423490f66b4ac55dacc476da..20dd7782e6e7fd0a3d3888dbfeb4f4ba044b8d38 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=holiday%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=holiday%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -36,7 +36,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index 76fa344726e0d55ef096b9ebe0aaa0044415ea2d..eb10de922efd677e2a7621299d5ed8c1cf4670e9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=html_mail%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=html_mail%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
@@ -22,5 +22,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 954d9ad8703f435c808c0901436882eb3147147e..4245c1d755a81b13432f55c216bdfc196cc211f1 100644 (file)
@@ -18,9 +18,9 @@
                $content[joined]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               <form accept-charset="UTF-8" style="paddin-bottom:0px">
+               {%form%}
                        <input type="button" name="edit" class="form_submit disabled" title="{--MEMBER_REFBACK_DELETED_TITLE--}"
                         disabled="disabled" value="{--MEMBER_REFBACK_DELETED_SUBMIT--}" />
-               </form>
+               {%form_close%}
        </td>
 </tr>
index e2fb30b378f8fe5acb80468116dc6f81353fe460..9c779d0b22f2c814666f42df307700fb792ddfa9 100644 (file)
@@ -18,9 +18,9 @@
                $content[joined]
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom">
-               <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=refback%}" method="post">
+               {%form,formMethodPost=modules.php?module=login&amp;what=refback%}
                        <input type="hidden" name="id" value="$content[id]" />
                        <input type="submit" class="form_submit" name="edit" value="{--MEMBER_REFBACK_EDIT_SUBMIT--}" />
-               </form>
+               {%form_close%}
        </td>
 </tr>
index 3c2805fdbab850922946d6363f4fde03aafbd611..0bb2340c9d9c55b8631614884bed183b49dee743 100644 (file)
@@ -1,7 +1,7 @@
 <td align="center" width="$content[width]%%">
-       <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=list_surfbar%}" method="post">
+       {%form,formMethodPost=modules.php?module=login&amp;what=list_surfbar%}
                <input type="hidden" name="url_id" value="$content[url_id]" />
                <input type="hidden" name="action" value="$content[action]" />
                <input type="submit" class="form_submit" name="ok" title="{%pipe,translateMemberSurfbarActionToTitle=$content[action]%}" value="{%pipe,translateMemberSurfbarActionToSubmit=$content[action]%}" />
-       </form>
+       {%form_close%}
 </td>
index e22ed9390a3396bf670e5d09e8a30de704f844ba..261ce79157e3652a206a69d521f4b34c1d6c37f3 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=subids%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=subids%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
@@ -20,5 +20,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 19b25d20bd7f8c6d61a9ce9982ae59f69f10936f..38605f883dc93f0f7bcb06f8b339408160dee586 100644 (file)
@@ -1,3 +1,3 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=mydata%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=mydata%}
        <input type="submit" name="edit" class="form_reset" value="{--MEMBER_EDIT_PROFILE--}" />
-</form>
+{%form_close%}
index fc99eccbe0e5a6f7404f933c0f9866ccb72483fa..f45fea061cdabd1dd9a51b6ef08de6c2c9b09de5 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=mydata%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=mydata%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="header_column bottom" colspan="2">
@@ -83,5 +83,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 10cdb676f41953f27e1a555f993acd67a6e7a642..8adb8f7a9daeec7a03c3374ff6763758444f7710 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=newsletter%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=newsletter%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="header_column bottom" colspan="2"><strong>{--NL_MEMBER_TITLE--}:</strong>
@@ -26,5 +26,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 8315a731055b305260eb153e00d74d6466299fe1..04668c3abea899005f2faf176c50c40bfe3ef92e 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=nickname%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=nickname%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="5" align="center" class="table_header bottom" height="30">
@@ -32,5 +32,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index e2125ec596613605b22e63de9a2d76ab01767287..6b413bd5acb6517b49424026f88396a86950831d 100644 (file)
@@ -1,8 +1,8 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get" target="_parent">
+{%form,formMethodGet,formTarget_parent=modules.php%}
        <input type="hidden" name="module" value="login" />
        <input type="hidden" name="what" value="order" />
        <input type="hidden" name="order" value="$content" />
        <input type="submit" class="form_reset" value="{--MEMBER_GO_BACK--}" />
-</form>
+{%form_close%}
 </div>
index 3b09f801ed1a9631bf1c392c5ec03c87fd502b0e..5eaa9018ce672b6d39ad3081c688588462d4e645 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=order%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--MEMBER_ORDER_PAGE1_TITLE--}</strong>
@@ -14,5 +14,5 @@
                <input type="submit" name="data" class="form_submit" value="{--ORDER_PAGE_2--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index d8954f64aa5f0f8cc8b8ebd57f321fd20ff98669..12b007a41f7e59c8b70fab6481494431f68c4b76 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=order%}
 <div class="table dashed">
        <div class="table_header bottom">
                <strong>{--MEMBER_ORDER_PAGE2_TITLE--}</strong>
@@ -75,5 +75,5 @@
                <input type="submit" name="frametester" class="form_submit" value="{--CONTINUE_FRAMETESTER--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index ed5fc8ff319bd9968a73dbb2869da04f7d241702..ef8b03fa4618ebe7df58e6197f8dc1cf8bbcbaa6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="form" action="{%url=modules.php?module=order&amp;order=$content%}" method="post" target="_parent" onsubmit="return Submit()">
+{%form,formMethodPost,formTarget_parent=modules.php?module=order&amp;order=$content%}
 <div>
        {--MEMBER_ORDER_PLEASE_WAIT_1--}<span id="counter" style="font-weight:bold">10</span>{--MEMBER_ORDER_PLEASE_WAIT_2--}
 </div>
@@ -7,5 +7,12 @@
        <input type="submit" class="form_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
 </div>
 <script type="text/javascript" src="{%url=js.php?js=order_send%}{%ext,version=order%}"></script>
-</form>
+<script type="text/javascript">
+<!--
+$('#form').submit(function() {
+       return submitForm();
+});
+//-->
+</script>
+{%form_close%}
 </div>
index 95fb7ae85329386750e8c49ba647648b4e218426..8df4fc506123527a4bd40493ebc6232381f82bf7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=order%}
        <div class="table_header bottom">
                {--MEMBER_THANX_ORDER_TITLE--}
        </div>
@@ -11,5 +11,5 @@
        <div class="table_footer">
                <input type="submit" class="form_submit" value="{--MEMBER_CONTINUE_AREA--}" />
        </div>
-</form>
+{%form_close%}
 </div>
index cbfdb38f9c293a97ffffb395bc376320f31837a1..a31541f3e5cb482f02a9c3ba731cf16e07cb9800 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -45,7 +45,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
 
 <div class="notice">
index e5808f2a7ff45318e30fc62722eedafe58d6adf5..ab398738e4869571b64e09f6e21f3ee332520e2a 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -45,7 +45,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. //-->
 <div class="notice">(*):&nbsp;{--PAYOUT_BANNER_NOTICE--}</div>
index aa205e36b79bb06210eb544bce4c25266c86054b..9ee70e07a635ad0c106ebd80f4b48b15f065ab71 100644 (file)
        </tr>
        <tr>
                <td align="center" class="left">
-                       <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=mydata%}" method="post">
+                       {%form,formMethodPost=modules.php?module=login&amp;what=mydata%}
                                <input type="submit" name="notify" class="form_reset" value="Benachrichtigung abschalten" />
-                       </form>
+                       {%form_close%}
                </td>
                <td align="center" class="right">
-                       <form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=mydata%}" method="post">
+                       {%form,formMethodPost=modules.php?module=login&amp;what=mydata%}
                                <input type="submit" name="edit" class="form_reset" value="Profildaten &auml;ndern" />
-                       </form>
+                       {%form_close%}
                </td>
        </tr>
 </table>
index 23c1ec6f3e9ccf11b2d82ce435f71e96ff45551d..d6c0aa4dddbe8ebf6946f90ed94dfc34de6ccdf7 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=support%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=support%}
 <div class="table dashed">
 
 <div class="header_column bottom">
@@ -43,5 +43,5 @@ Meine id bei Ihrem {?mt_word?} lautet: {%pipe,getMemberId%}
 </div>
 
 </div>
-</form>
+{%form_close%}
 </div>
index 14f2dabe5f34f309bd04deb28315b0a225e55e85..8008a43c5fe1d5c915483e864d4515069158947d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="delete" action="{%url=modules.php?module=login&amp;what=list_surfbar%}" method="post">
+{%form,formIdDelete,formMethodPost=modules.php?module=login&amp;what=list_surfbar%}
 <div class="table dashed" style="margin-top:10px">
        <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar l&ouml;schen:</strong>
@@ -28,7 +28,7 @@
                <input type="submit" class="form_delete" name="ok" value="{--MEMBER_SURFBAR_ACTION_DELETE_NOW_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 
 <div class="notice">
        <strong>Hinweis:</strong> Irt&uuml;mlich gel&ouml;schte URLs k&ouml;nnen nur
index 1188ce9c392310224333f4083fe66d68302cce81..6528368efa240060da7da80e597f10ce4226c547 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" id="edit" action="{%url=modules.php?module=login&amp;what=list_surfbar%}" method="post" onsubmit="return SubmitForm()" onreset="return ResetForm()">
+{%form,formIdEdit,formMethodPost=modules.php?module=login&amp;what=list_surfbar%}
 <div class="table3 dashed" style="margin-top:10px">
        <div class="table_header bottom" style="padding-top:5px;padding-bottom:5px">
                <strong>URL in Surfbar editieren:</strong>
@@ -20,7 +20,7 @@
        </div>
 
        <div class="table_header top" style="padding-top:5px;padding-bottom:5px">
-               <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+               <input type="reset" class="form_reset" id="reset" value="{--CLEAR_FORM--}" />
                <input type="hidden" name="url_id" value="$content[url_id]" />
                <input type="hidden" name="action" value="edit" />
                <input type="hidden" name="execute" value="1" />
        </div>
 </div>
 
-<script src="{%url=js.php?js=surfbar_member_edit%}{%ext,version=surfbar%}&amp;url_views_max=$content[url_views_max]&amp;limited=$content[limited]"
- type="text/javascript"></script>
-</form>
+<script type="text/javascript"
+ src="{%url=js.php?js=surfbar_member_edit%}{%ext,version=surfbar%}&amp;url_views_max=$content[url_views_max]&amp;limited=$content[limited]"></script>
+<script type="text/javascript">
+<!--
+$('#edit').submit(function() {
+       return submitForm();
+});
+
+$('#reset').click(function() {
+       return resetForm();
+});
+//-->
+</script>
+
+{%form_close%}
 </div>
index 0701af1ffb93f000011d5483d0e02fe8f084a8f7..c25ecb5f2d646cdb440965bb0bf9488b26f1ef3e 100644 (file)
@@ -1,8 +1,8 @@
 <div align="center">
        {--MEMBER_THEME_LIST_USAGE--}
 
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=themes%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       {%form,formMethodPost=modules.php?module=login&amp;what=themes%}
+       <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="header_column bottom right" align="center">{--THEME_UNIX--}</td>
                <td class="header_column bottom right" align="center">{--THEME_NAME--}</td>
@@ -17,8 +17,8 @@
                        <input type="submit" class="form_submit" name="ok" value="{--MEMBER_SAVE_THEME--}" />
                </td>
        </tr>
-</table>
-</form>
+       </table>
+       {%form_close%}
 </div>
 
 <div class="notice">
index 62abcc96a9efc37ec379ca9dc3bb5b7c1eacb03e..139ccd8fb51b01c32ec5419f03532b15a71a4a63 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=transfer&amp;do=new%}
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="right" class="bottom" height="40"><strong>
@@ -56,5 +56,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 95662a006cc1d10939906be1d8471275509ff0c8..fe39371b9bc0a3776f302e2896211816922ca17b 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=transfer%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=transfer%}
 <table border="0" cellspacing="0" cellpadding="0" width="420" class="table dashed">
        <tr>
                <td align="center" width="260" class="bottom" height="50">
@@ -16,4 +16,4 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
index fc97d2cdc9342381775198563e3d617c6858deb7..2ea7dd954f387e1e5d40236fd66883898f46c734 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;do=payout%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=wernis&amp;do=payout%}
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom" height="30">
@@ -33,7 +33,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="para">
        <strong class="notice">{--MEMBER_WERNIS_PAYOUT_NOTICE--}</strong>
index 98d3cd45ddc20401605bba219f5e4b74bd7dd85e..ffba548d33dc76d4db55d9fbdb18875426e27303 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=login&amp;what=wernis&amp;do=withdraw%}" method="post">
+{%form,formMethodPost=modules.php?module=login&amp;what=wernis&amp;do=withdraw%}
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
@@ -33,7 +33,7 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 
 <div class="notice">
        <strong class="notice">{--MEMBER_WERNIS_WITHDRAW_NOTICE--}</strong>
index de66eba94fb7978727e14469ea72a86cf0b0b8d9..bb99026d635a4ccca1304cfed6ab5435fbd178df 100644 (file)
@@ -7,6 +7,6 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="language" content="de" />
 
-<script src="{%url=js/jquery.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>
+<script src="{%jquery%}{%ext,version=sql_patches%}" type="text/javascript"></script>
 <script src="{%url=js/core-common.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>
 <script src="{%url=js/menu-common.js?dummy=1%}{%ext,version=sql_patches%}" type="text/javascript"></script>
index bb5e35b17dc7c17307f3c6c66c82b4b287eb1689..4016e43c3d951e6d75efdf00e3af6642beda5eef 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
+{%form,formMethodGet=modules.php%}
 <input type="hidden" name="module" value="admin" />
 <input type="hidden" name="what" value="{%pipe,getWhat%}" />
 <div class="table dashed">
@@ -17,5 +17,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_DO_ACTION--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 7ac4659829a6512809998a277f614354bcfea3c9..d38523b2abfafcadbfe87008eb066f40d3fe818c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
+{%form,formMethodGet=modules.php%}
 <input type="hidden" name="module" value="{%pipe,getModule%}" />
 <input type="hidden" name="what" value="{%pipe,getWhat%}" />
 <div class="table dashed">
@@ -15,5 +15,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_CHOOSE_NETWORK_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 1584919223071315b19f6edd943bc3aa416e7500..48fa59ff4745fed7a77e0fd46d3f5657b38a94ce 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
+{%form,formMethodGet=modules.php%}
 <input type="hidden" name="module" value="{%pipe,getModule%}" />
 <input type="hidden" name="what" value="{%pipe,getWhat%}" />
 <input type="hidden" name="network_id" value="{%network,getNetworkDataById,network_id=%network_id%%}" />
@@ -24,5 +24,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_CHOOSE_NETWORK_HANDLER_TYPE_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index 4b3607fe7ce8b65722b8596b484ae58f0d2617d8..4601b49f5c3947f8d75d6ba15177f2df6263f560 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{?URL?}/modules.php" method="get">
+{%form,formMethodGet=modules.php%}
 <input type="hidden" name="module" value="{%pipe,getModule%}" />
 <input type="hidden" name="what" value="{%pipe,getWhat%}" />
 <div class="table dashed">
@@ -17,5 +17,5 @@
                <input type="submit" class="form_submit" value="{--ADMIN_CHOOSE_NETWORK_HANDLER_TYPE_SUBMIT--}" />
        </div>
 </div>
-</form>
+{%form_close%}
 </div>
index a0096784deffe52d8cbccc6e58d46cb991e5078b..2dfe5a41fdad86fdd0df02985262b9ff227f67a9 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=sponsor&amp;what=account%}" method="post">
+{%form,formMethodPost=modules.php?module=sponsor&amp;what=account%}
 <table border="0" cellspacing="0" cellpadding="0" width="550" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom" height="32">
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 4cf3e8011ed41784af16cd5929f315a1fc3e25f4..54a4089cfca28772e15ae9bef01ee5e9a12970ef 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=sponsor&amp;what=fillup%}" method="post">
+{%form,formMethodPost=modules.php?module=sponsor&amp;what=fillup%}
 <table border="0" cellspacing="0" cellpadding="0" width="450" class="table dashed">
 <tr>
        <td class="table_header bottom" colspan="2" align="center" height="37">
@@ -37,5 +37,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 942a132d2f988dbc15c784fe6ade09ccc44e334f..65d0448fcdc27ef2caf3bee18855dadfed3d429b 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=sponsor&amp;what=settings%}" method="post">
+{%form,formMethodPost=modules.php?module=sponsor&amp;what=settings%}
 <table border="0" cellspacing="0" cellpadding="0" width="550" class="table dashed">
 <tr>
        <td colspan="2" align="center" class="table_header bottom" height="32">
@@ -48,5 +48,5 @@
        </td>
 </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 84b3d429cf259e179cf1da00e57efb7599ca0662..f41e48144a2cb392167066e8213a62ea44f7d574 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom:10px">
-<form accept-charset="UTF-8" action="{%url=surfbar.php%}" method="post">
+{%form,formMethodPost=surfbar.php%}
 <table border="0" cellspacing="0" cellpadding="0" class="guest_login dashed">
        <tr>
                <td colspan="4" align="center" class="guest_login_header bottom">
@@ -23,5 +23,5 @@
                </td>
        </tr>
 </table>
-</form>
+{%form_close%}
 </div>
index 9ea296866cb9bce0fed4dac489233fde31cf2b37..1aade2b6fbb4be91ee76c255cc127170033cc1c4 100644 (file)
@@ -1,7 +1,7 @@
-<form accept-charset="UTF-8" action="$content[form_action]" method="post">
-       <select name="new_theme" class="form_select">
+{%form,formMethodPost=$content[form_action]%}
+       <select name="new_theme" class="form_select" size="1">
                $content[selection]
        </select>
        <br />
        <input type="submit" class="form_submit" name="theme_change" value="{--CHANGE_THEME--}" />
-</form>
+{%form_close%}
index 10e14323d25da1ddbbef1d28e4bc56349c1146d3..568fa708fe2cd487c38f68963bd07111b21dfb72 100644 (file)
@@ -107,4 +107,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="forced_ads_userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index 697202262e1473bae334ac8c10119769ef7a1ad5..459c4590d488fb80018b2fd730c57cbfe26fe473 100644 (file)
@@ -86,4 +86,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index 343f69db206fcc21c09823bf1751a277ee0c3baa..69206340552d644dbacefa84b7015ce051805438 100644 (file)
@@ -100,4 +100,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="url_userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index a1002eacba0f29830b18e669506353ae4f7a0065..f5862fed306e7d574d33ed897802e55e2d8fd74a 100644 (file)
@@ -35,7 +35,6 @@ MA  02110-1301  USA
        //-->
        <database-table name="" type="string" value="user_subids" />
        <!--
-       <!--
        And all column names to read/write, leave this list tag empty for all (*).
        //-->
        <database-column-list>
@@ -45,7 +44,7 @@ MA  02110-1301  USA
                //-->
                <database-column-list-entry name="" type="string" table="" value="id" alias="" function="" />
                <database-column-list-entry name="" type="string" table="" value="userid" alias="" function="" />
-               <database-column-list-entry name="added_list" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
+               <database-column-list-entry name="subid_added" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
                <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />
        </database-column-list>
        <!--
@@ -57,7 +56,7 @@ MA  02110-1301  USA
                A call-back function list entry
                //-->
                <callback-function-list-entry name="" type="string" value="bigintval" />
-               <callback-function-list-entry name="added_list" type="string" value="generateDateTime" />
+               <callback-function-list-entry name="subid_added" type="string" value="generateDateTime" />
        </callback-function-list>
        <!--
        Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
@@ -65,21 +64,6 @@ MA  02110-1301  USA
        call-back function. See function handleExtraValues() for details.
        //-->
        <extra-parameter-list>
-               <!--
-               A one-dimensional array with some entries
-               //-->
-               <extra-parameter-list-entry name="" type="array" value="added">
-                       <!--
-                       Our 'added' array
-                       //-->
-                       <extra-parameter-added-list>
-                               <!--
-                               A bool entry in the 'bar' array, all other types are added in a
-                               similar way.
-                               //-->
-                               <extra-parameter-added-list-entry name="" type="int" value="2" />
-                       </extra-parameter-added-list>
-               </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
        Wether to 'edit/delete/change' (change) the entries (true) or just read them for displaying (false)
@@ -100,4 +84,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index fb2348733f52a3951e9f33e29d714c764905cbec..ccc0fa91c1ba88bd8eceb0cf68bbc5694f2be6e6 100644 (file)
@@ -135,4 +135,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="forced_ads_userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index bf6050ed3605a2824a004477538edcaebbcfb760..8919714ad2a175152d375dd4f61ceffef8e76b9e 100644 (file)
@@ -150,4 +150,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="forced_campaign_userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index e30c47560b7592d17e10dcb7d9c7fbfe8dd22c52..a885c3ef3baca706f92443718ab5fccfd1683e97 100644 (file)
@@ -81,4 +81,18 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <table-id-column name="" type="string" value="forced_costs_id" />
+       <!--
+       The table column which should be taken for user ids
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <table-userid-column name="" type="string" value="" />
+       <!--
+       Raw userid column ($key) to skip which is always an invalid (?) entry
+       This' type can again only be 'string' (remember why?).
+       //-->
+       <raw-userid-column-key name="" type="string" value="" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index 6e08bea5b8ad65f96fc78a339189dbf55b7c09c4..fc41ba7faa634a9a7230ed6c28acf3cca5026ddd 100644 (file)
@@ -92,4 +92,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index c5c61a724560af81a81a3b175853521fa7cb0b99..a3777bbe2da1540498ca7f5af71e62d7be988bed 100644 (file)
@@ -89,4 +89,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index 99700ecb50d119e089ac4c3be3e46dc616a0d3c9..466d00bf80869a64fff19d676ade3daff914b88e 100644 (file)
@@ -163,4 +163,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="url_userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index b2386d9a2f7009da1e6ce3c45f85d50537804a4d..faecde36b9bc83fdbe7738dc5ee722966a89951f 100644 (file)
@@ -43,7 +43,7 @@ MA  02110-1301  USA
                numerical column names?
                //-->
                <database-column-list-entry name="" type="string" table="" value="id" alias="" function="" />
-               <database-column-list-entry name="added_list" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
+               <database-column-list-entry name="subid_added" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
                <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />
        </database-column-list>
        <!--
@@ -55,7 +55,7 @@ MA  02110-1301  USA
                A call-back function list entry
                //-->
                <callback-function-list-entry name="" type="string" value="bigintval" />
-               <callback-function-list-entry name="added_list" type="string" value="generateDateTime" />
+               <callback-function-list-entry name="subid_added" type="string" value="generateDateTime" />
        </callback-function-list>
        <!--
        Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
@@ -85,21 +85,6 @@ MA  02110-1301  USA
                                <extra-parameter-member-list-entry name="" type="string" value="userid[]" />
                        </extra-parameter-member-list>
                </extra-parameter-list-entry>
-               <!--
-               A one-dimensional array with some entries
-               //-->
-               <extra-parameter-list-entry name="" type="array" value="added">
-                       <!--
-                       Our 'added' array
-                       //-->
-                       <extra-parameter-added-list>
-                               <!--
-                               A bool entry in the 'added' array, all other types are added in a
-                               similar way.
-                               //-->
-                               <extra-parameter-added-list-entry name="" type="int" value="2" />
-                       </extra-parameter-added-list>
-               </extra-parameter-list-entry>
        </extra-parameter-list>
        <!--
        Columns for converting single time selections into a timestamp
@@ -125,4 +110,8 @@ MA  02110-1301  USA
        This' type can again only be 'string' (remember why?).
        //-->
        <raw-userid-column-key name="" type="string" value="userid" />
+       <!--
+       Cache file to delete
+       //-->
+       <cache-file name="" type="string" value="" />
 </admin-entry-meta-data>
index f4fb7b70b03cab426baf572bf7f05cdbc1a130c1..f4b00bea79132163e54f83845aec8dfff3b0a9d7 100644 (file)
@@ -121,4 +121,8 @@ MA  02110-1301  USA
                        </callback-extra-parameter-list>
                </column-callback-list-entry>
        </column-callback-list>
+       <!--
+       How the named column shall be logical linked to the above.
+       //-->
+       <where-condition type="string" name="" condition="" />
 </member-list-data>
index 7f9a24fef55b0bc66b448cbbe5f420ed06688ce3..25f69552cc00ce54603a086d9615a753e4ef554e 100644 (file)
@@ -117,4 +117,8 @@ MA  02110-1301  USA
                        </callback-extra-parameter-list>
                </column-callback-list-entry>
        </column-callback-list>
+       <!--
+       How the named column shall be logical linked to the above.
+       //-->
+       <where-condition type="string" name="" condition="" />
 </admin-list-data>
index d38e9953ac66ee037e161be113cce27c8814ffbf..506630b915d7bbe29987ed762e87581685dae73e 100644 (file)
@@ -44,7 +44,7 @@ MA  02110-1301  USA
                //-->
                <database-column-list-entry name="" type="string" table="" value="id" alias="" function="" />
                <database-column-list-entry name="" type="string" table="" value="userid" alias="" function="" />
-               <database-column-list-entry name="added_list" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
+               <database-column-list-entry name="subid_added" type="string" table="" value="subid_added" alias="subid_added" function="UNIX_TIMESTAMP" />
                <database-column-list-entry name="" type="string" table="" value="subid" alias="" function="" />
        </database-column-list>
        <!--
@@ -56,7 +56,7 @@ MA  02110-1301  USA
                A call-back function list entry
                //-->
                <callback-function-list-entry name="" type="string" value="bigintval" />
-               <callback-function-list-entry name="added_list" type="string" value="generateDateTime" />
+               <callback-function-list-entry name="subid_added" type="string" value="generateDateTime" />
        </callback-function-list>
        <!--
        Extra parameters (2nd, 3rd, ...) for above call-back functions. If an array
@@ -67,7 +67,7 @@ MA  02110-1301  USA
                <!--
                A one-dimensional array with some entries
                //-->
-               <extra-parameter-list-entry name="" type="array" value="added">
+               <extra-parameter-list-entry name="" type="array" value="subid_added">
                        <!--
                        Our 'added' array
                        //-->
index ef6be1c7504c954c0dd3f404373347d28824c080..62c550a01ca861f8218e8e9fb684dc08fdfbdcec 100644 (file)
@@ -39,6 +39,19 @@ A:hover {
        background-color: transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea, select, option {
        color: #000000;
        border: 1px solid #000000;
index eefbb6a7d546c2802414a809e7463faa6caf12e5..301efebc3f3e2a797b1f1d42537c4596d900f09e 100644 (file)
@@ -40,6 +40,19 @@ A:hover {
        background-color: transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea {
        color: #009900;
        background-color: #eeffee;
index d5b4ad858da1ec8a54d9a617cdda7856a5ed12d1..8c4b02dd961a1e1b2a6349c75922761806d99a53 100644 (file)
@@ -39,6 +39,19 @@ A:hover {
        background-color: transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea, select, option {
        color: #880000;
        background-color: #eeeebb;
index d3bf0e0d315958da62e46e11a0cee18122fb589d..9c72b416b73b4f11053035d3bbb3585f8aa74207 100644 (file)
@@ -40,6 +40,19 @@ A:hover {
        background-color: transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea, select, option {
        color: #2e51a9;
        background-color: #eeffee;
index d5d27ecb1ac9f91e46f7d66966f75ae043cd992c..65e973e4fca4e186274edd77cd86ff5889544030 100644 (file)
@@ -42,6 +42,19 @@ A:hover {
        background-color        : transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea, select, option {
        color                   : #ffffff;
        background-color        : #0571cc;
index c41b1729dc4d69bce32e2471d98c663ddd0e2dac..88980acd9bdab310737b3bf2f599de79d4705434 100644 (file)
@@ -41,6 +41,19 @@ A:hover {
        background-color        : transparent;
 }
 
+form {
+       margin: 0px;
+       margin-left: 0px;
+       margin-right: 0px;
+       margin-top: 0px;
+       margin-bottom: 0px;
+       padding: 0px;
+       padding-left: 0px;
+       padding-right: 0px;
+       padding-top: 0px;
+       padding-bottom: 0px;
+}
+
 input, textarea, select, option {
        color                   : #000000;
        background-color        : #FFFFFF;