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 7c1e89e..e0baf6e 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 6fb9e3c..f0b1a06 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 55616a0..8f5aada 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 095187b..2408c75 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 035f169..cfa68f5 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 7c59f5d..c798121 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 8715bc7..4b8c5a2 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 3693439..e70d284 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 12a9b43..29634ca 100644 (file)
@@ -153,7 +153,7 @@ switch (getExtensionMode()) {
                //
                $GLOBALS['url_ends'] = array(
                        ' ',
-                       chr(10),
+                       PHP_EOL,
                        chr(13),
                        ')',
                );
index 0866599..fcbbb39 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 d4efcfa..60d49f3 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 8a11ac1..c75f484 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 31c22ee..26dd41d 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 8301922..4852a2c 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 c72f7eb..5fae902 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 cf83770..67a7043 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 0b5152c..fe21fae 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 be9915b..be1698f 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 5f725ef..256c824 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 45ee3be..ce5a8b9 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 31cfefd..beac76a 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 11ea619..40f9e68 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 62c13a1..be00219 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 2a52309..735b1a5 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 11bb77c..2568743 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 f0f8082..b1243ce 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 1a8e05b..3fce3a9 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 213b7fa..d55ba8d 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 75e43f4..a9f9405 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 9476cb0..a9ba796 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 3891d32..ba4c0e2 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 60570ec..ed16115 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 5068047..fe4c5c3 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 1831d44..aa369cd 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 91adcd5..13ea31c 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 82bf013..0bc3999 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 c954fa4..c67f0d5 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 d655ed3..6da574d 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 9af3c5b..b0b960f 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 16eb57d..0078fc0 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 5dfaf13..fad3d46 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 cd66947..da6b87a 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 106302b..741db75 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 e61d978..a889ec1 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 7601911..cea985d 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 e8b9e23..1849e2f 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 208c2f2..dcf6276 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 c8b651c..ba56fb2 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 217f8e7..2a11ccc 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 66b412d..ae2a315 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 49c3981..f91dacb 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 2200018..af8528b 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 d291f5b..602eae7 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 5d22c87..411b018 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 b1c93a7..cc4d110 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 ae4d4a3..5d42442 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 809e287..bd80fe1 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 ad5dd02..046527c 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 36df4b8..669a665 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 36420bd..d21798d 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 5453ed0..378257a 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 b60cbbd..0c2424a 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 9984cad..8915f38 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 ba7bc21..34328fb 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 5eef712..761401f 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 9bc4887..67bd737 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 4f70df3..0217d37 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 e4bda05..57af05e 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 6f0d489..09a6da5 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 8513225..46287db 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 2af9902..5f40c3a 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 7cba130..43fc738 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 105ee5c..09348da 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 d696608..66d5c55 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 58bde3d..c1964eb 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 79b60b2..0dbb3d2 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 72b919e..d6d1f8a 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 d70776d..4d3fcce 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 bd3de06..5455b6b 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 b9300c5..d20078f 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 0f9fa2b..aa6d967 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 600a0f8..7517ffd 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 42ce668..3064d04 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 bbd2a54..77bb782 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 0cfa2c0..c763757 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 2f8c211..1bd75e7 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 6ec0fb3..c876f1c 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 646b1fd..74944e8 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 4f90a09..572d1a4 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 62a25c5..93f6243 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 0e8a428..e5945a8 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 3f0cacb..8e8d0ad 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 7bae83b..92e950e 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 6f5ca04..fefab08 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 3b9d577..d7c8181 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 8f41726..87dd723 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 1d3e893..6d96456 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 52eefd2..bfdd037 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 435556c..11f5d85 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 480175e..0942f36 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 c7bca54..3d418df 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 53ba902..7b1580e 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 74b7710..20fe83c 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 f5d82e9..e17e77d 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 1c3d904..2ef4a0d 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 84e5c90..edaffe9 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 0d16a3a..9f42bc2 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 5b840eb..7a5512a 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 922f3ca..c7a802d 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 a379411..8473d04 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 93e1cc4..d8bc757 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 49c3b38..6891539 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 6e41d14..8a4b12f 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 fbb6aa7..fe02483 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 0916ddb..330a001 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 b9e81e1..28cb2d8 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 d8b76db..dc80e13 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 439e92e..a64ff5b 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 f9793b1..75fe947 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 6cedde5..3655c36 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 945c161..f8dcc4d 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 37036e7..bf4d3ff 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 c33fdad..bb6d863 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 5bddc46..a75ec61 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 0d02b24..53527b5 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 6dc3b0c..cd02d07 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 6e5fa7b..feced38 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 84aca3a..e14934d 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 8159e01..5d24992 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 a6befeb..b94f8d3 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 cefd999..8752a45 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 a952225..c1b3ab5 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 2d42e33..3998f9f 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 ff2920f..3162be7 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 78b6730..b0a8a5a 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 447f901..517ed0e 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 824b32d..5d93e2d 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 87483ea..3516081 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 669c7b4..676e0db 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 8039d7e..f3b4d7d 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 ff36442..ff4ca3a 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 31a1910..5133b09 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 cee78fd..891e1df 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 a61240a..2829502 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 a905563..b49730d 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 1ab7cb5..90d7c3f 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 3e12515..49d87e1 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 4b96544..36539af 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>