Global rewrite of engine:
authorRoland Häder <roland@mxchange.org>
Wed, 18 Nov 2009 03:45:39 +0000 (03:45 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 18 Nov 2009 03:45:39 +0000 (03:45 +0000)
- Cookie-less (even no session cookie) should now work
  (maybe with some flaws)
- Some code cleanups

390 files changed:
.gitattributes
beg.php
click.php
debug.php
inc/config-global.php
inc/databases.php
inc/extensions/ext-bonus.php
inc/extensions/ext-mediadata.php
inc/extensions/ext-mydata.php
inc/extensions/ext-register.php
inc/extensions/ext-sql_patches.php
inc/filters.php
inc/functions.php
inc/language/de.php
inc/language/doubler_de.php
inc/language/sponsor_de.php
inc/libs/active_functions.php
inc/libs/admins_functions.php
inc/libs/task_functions.php
inc/libs/theme_functions.php
inc/libs/user_functions.php
inc/modules/admin.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-config_home.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_transfer.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-email_archiv.php
inc/modules/admin/what-email_details.php
inc/modules/admin/what-guestedit.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_doubler.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_notifications.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_rallyes.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-logs.php
inc/modules/admin/what-memedit.php
inc/modules/admin/what-stats_mods.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-usage.php
inc/modules/guest/what-rallyes.php
inc/modules/member/what-
inc/modules/member/what-rallyes.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-transfer.php
inc/modules/member/what-wernis.php
inc/mysql-manager.php
inc/session.php
inc/stylesheet.php
inc/wrapper-functions.php
index.php
templates/de/html/admin/admin_add_bank_package.tpl
templates/de/html/admin/admin_add_banner.tpl
templates/de/html/admin/admin_add_cat.tpl
templates/de/html/admin/admin_add_country.tpl
templates/de/html/admin/admin_add_max.tpl
templates/de/html/admin/admin_add_network.tpl
templates/de/html/admin/admin_add_payment.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_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_admin_add.tpl
templates/de/html/admin/admin_admins_add.tpl
templates/de/html/admin/admin_admins_add_acl.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_amenu_delete.tpl
templates/de/html/admin/admin_amenu_edit.tpl
templates/de/html/admin/admin_amenu_edit_form.tpl
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_admins.tpl
templates/de/html/admin/admin_config_admins_del.tpl
templates/de/html/admin/admin_config_admins_edit.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_cats.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_email.tpl
templates/de/html/admin/admin_config_email_del.tpl
templates/de/html/admin/admin_config_email_edit.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_home_main.tpl
templates/de/html/admin/admin_config_home_settings.tpl
templates/de/html/admin/admin_config_mediadata.tpl
templates/de/html/admin/admin_config_menu.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_order_form.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_config_payouts.tpl
templates/de/html/admin/admin_config_payouts_del.tpl
templates/de/html/admin/admin_config_payouts_edit.tpl
templates/de/html/admin/admin_config_point_settings.tpl
templates/de/html/admin/admin_config_points.tpl
templates/de/html/admin/admin_config_primera.tpl
templates/de/html/admin/admin_config_proxy.tpl
templates/de/html/admin/admin_config_rallye_del.tpl
templates/de/html/admin/admin_config_rallye_edit.tpl
templates/de/html/admin/admin_config_rallye_prices.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_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_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_admins.tpl
templates/de/html/admin/admin_del_bank_packages.tpl
templates/de/html/admin/admin_del_cats.tpl
templates/de/html/admin/admin_del_networks.tpl
templates/de/html/admin/admin_del_payments.tpl
templates/de/html/admin/admin_del_sponsor.tpl
templates/de/html/admin/admin_del_surfbar_urls.tpl
templates/de/html/admin/admin_del_user.tpl
templates/de/html/admin/admin_edit_admins.tpl
templates/de/html/admin/admin_edit_bank_packages.tpl
templates/de/html/admin/admin_edit_cats.tpl
templates/de/html/admin/admin_edit_email.tpl
templates/de/html/admin/admin_edit_email_select.tpl
templates/de/html/admin/admin_edit_networks.tpl
templates/de/html/admin/admin_edit_payments.tpl
templates/de/html/admin/admin_edit_rallyes.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_urls.tpl
templates/de/html/admin/admin_edit_user.tpl
templates/de/html/admin/admin_email_archiv_row.tpl
templates/de/html/admin/admin_ext_reg_form.tpl
templates/de/html/admin/admin_extensions.tpl
templates/de/html/admin/admin_extensions_delete.tpl
templates/de/html/admin/admin_extensions_edit.tpl
templates/de/html/admin/admin_footer.tpl
templates/de/html/admin/admin_gmenu_delete.tpl
templates/de/html/admin/admin_gmenu_edit.tpl
templates/de/html/admin/admin_gmenu_edit_form.tpl
templates/de/html/admin/admin_gmenu_status.tpl
templates/de/html/admin/admin_guest_add.tpl
templates/de/html/admin/admin_list_admins.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_beg_rows.tpl
templates/de/html/admin/admin_list_bonus_emails_row.tpl
templates/de/html/admin/admin_list_bonus_form.tpl
templates/de/html/admin/admin_list_cats.tpl
templates/de/html/admin/admin_list_cats_404.tpl
templates/de/html/admin/admin_list_chk_reg_row.tpl
templates/de/html/admin/admin_list_country.tpl
templates/de/html/admin/admin_list_country_form.tpl
templates/de/html/admin/admin_list_emails_row.tpl
templates/de/html/admin/admin_list_holiday.tpl
templates/de/html/admin/admin_list_imprint.tpl
templates/de/html/admin/admin_list_links.tpl
templates/de/html/admin/admin_list_mods.tpl
templates/de/html/admin/admin_list_networks.tpl
templates/de/html/admin/admin_list_networks_row.tpl
templates/de/html/admin/admin_list_notify_emails_row.tpl
templates/de/html/admin/admin_list_payments.tpl
templates/de/html/admin/admin_list_payouts.tpl
templates/de/html/admin/admin_list_rallye_noselect.tpl
templates/de/html/admin/admin_list_rallye_prices_row.tpl
templates/de/html/admin/admin_list_rallye_usr_row.tpl
templates/de/html/admin/admin_list_rallyes.tpl
templates/de/html/admin/admin_list_rallyes_row.tpl
templates/de/html/admin/admin_list_rallyes_row2.tpl
templates/de/html/admin/admin_list_sponsor.tpl
templates/de/html/admin/admin_list_sponsor_details.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_sponsor_row.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_surfbar_urls_row.tpl
templates/de/html/admin/admin_list_task_ext_rows.tpl
templates/de/html/admin/admin_list_transfer.tpl
templates/de/html/admin/admin_list_unconfirmed_row.tpl
templates/de/html/admin/admin_list_user_sort_form.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.tpl
templates/de/html/admin/admin_logout_form.tpl
templates/de/html/admin/admin_logout_sql_patches_install.tpl
templates/de/html/admin/admin_logout_sql_patches_remove.tpl
templates/de/html/admin/admin_maintenance_form.tpl
templates/de/html/admin/admin_member_add.tpl
templates/de/html/admin/admin_member_selection_box.tpl
templates/de/html/admin/admin_menu_overview_row.tpl
templates/de/html/admin/admin_mmenu_delete.tpl
templates/de/html/admin/admin_mmenu_edit.tpl
templates/de/html/admin/admin_mmenu_overview.tpl
templates/de/html/admin/admin_mmenu_status.tpl
templates/de/html/admin/admin_mods_edit.tpl
templates/de/html/admin/admin_network_added.tpl
templates/de/html/admin/admin_newsletter.tpl
templates/de/html/admin/admin_newsletter_nohtml.tpl
templates/de/html/admin/admin_next_link.tpl
templates/de/html/admin/admin_overview_header_task.tpl
templates/de/html/admin/admin_overview_list_ext_rows.tpl
templates/de/html/admin/admin_overview_table.tpl
templates/de/html/admin/admin_payout_accept_form.tpl
templates/de/html/admin/admin_payout_add_new.tpl
templates/de/html/admin/admin_payout_overview_form.tpl
templates/de/html/admin/admin_payout_reject_form.tpl
templates/de/html/admin/admin_points.tpl
templates/de/html/admin/admin_points_del.tpl
templates/de/html/admin/admin_points_edit.tpl
templates/de/html/admin/admin_refbanner.tpl
templates/de/html/admin/admin_refbanner_edit.tpl
templates/de/html/admin/admin_reg_form.tpl
templates/de/html/admin/admin_reset_pass_done.tpl
templates/de/html/admin/admin_reset_password.tpl
templates/de/html/admin/admin_reset_password_form.tpl
templates/de/html/admin/admin_send_bonus_form.tpl
templates/de/html/admin/admin_send_bonus_select.tpl
templates/de/html/admin/admin_send_reset_link.tpl
templates/de/html/admin/admin_send_yoomedia.tpl
templates/de/html/admin/admin_sub_points.tpl
templates/de/html/admin/admin_sub_points_all.tpl
templates/de/html/admin/admin_task_holiday.tpl
templates/de/html/admin/admin_task_order.tpl
templates/de/html/admin/admin_theme_edit.tpl
templates/de/html/admin/admin_theme_import_form.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/admin/admin_welcome.tpl
templates/de/html/admin/admin_welcome_admins.tpl
templates/de/html/beg/beg_banner.tpl
templates/de/html/beg/beg_link.tpl
templates/de/html/doubler/doubler_footer.tpl
templates/de/html/doubler/doubler_header.tpl
templates/de/html/doubler/doubler_index.tpl
templates/de/html/doubler/doubler_reflink.tpl
templates/de/html/guest/guest_confirm_link.tpl
templates/de/html/guest/guest_doubler.tpl
templates/de/html/guest/guest_frametester.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/guest/guest_stats_member.tpl
templates/de/html/guest/guest_stats_table.tpl
templates/de/html/index.tpl
templates/de/html/index_forward.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_welcome.tpl
templates/de/html/js/js_cookies_disabled.tpl
templates/de/html/js/js_uberwach.tpl
templates/de/html/lead_code.tpl
templates/de/html/login_failed_js.tpl
templates/de/html/mailid/mailid_banner.tpl
templates/de/html/mailid/mailid_confirm_buttom.tpl
templates/de/html/mailid/mailid_enter_code.tpl
templates/de/html/mailid/mailid_frames.tpl
templates/de/html/mailid/mailid_points_done2.tpl
templates/de/html/mailid/mailid_points_locked2.tpl
templates/de/html/mailid/mailid_timer.tpl
templates/de/html/mediadata.tpl
templates/de/html/member/member_bonus.tpl
templates/de/html/member/member_cats_header.tpl
templates/de/html/member/member_doubler.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_beg.tpl
templates/de/html/member/member_login_js.tpl
templates/de/html/member/member_mail_bonus_send.tpl
templates/de/html/member/member_mail_normal_send.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_frametester.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_payout_form.tpl
templates/de/html/member/member_payout_form_banner.tpl
templates/de/html/member/member_payout_li.tpl
templates/de/html/member/member_primera_mode_list.tpl
templates/de/html/member/member_primera_mode_pay.tpl
templates/de/html/member/member_profile_outdated.tpl
templates/de/html/member/member_refback_edit.tpl
templates/de/html/member/member_refback_list_row.tpl
templates/de/html/member/member_reflink_no_nickname.tpl
templates/de/html/member/member_support_form.tpl
templates/de/html/member/member_surfbar_book_dynamic.tpl
templates/de/html/member/member_surfbar_book_static.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_surfbar_link.tpl
templates/de/html/member/member_surfbar_list_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_unconfirmed_row.tpl
templates/de/html/member/member_unconfirmed_row_nopoints.tpl
templates/de/html/member/member_wernis_mode_list.tpl
templates/de/html/member/member_wernis_mode_payout.tpl
templates/de/html/member/member_wernis_mode_withdraw.tpl
templates/de/html/menu/menu_guest_advert_end.tpl
templates/de/html/menu/menu_guest_advert_main.tpl
templates/de/html/menu/menu_guest_advert_members.tpl
templates/de/html/menu/menu_guest_advert_online.tpl
templates/de/html/menu/menu_member_advert_account.tpl
templates/de/html/menu/menu_member_advert_bank.tpl
templates/de/html/menu/menu_member_advert_end.tpl
templates/de/html/menu/menu_member_advert_extras.tpl
templates/de/html/menu/menu_member_advert_logout.tpl
templates/de/html/menu/menu_member_advert_main.tpl
templates/de/html/menu/menu_member_advert_order.tpl
templates/de/html/menu/menu_member_advert_rals.tpl
templates/de/html/menu/menu_member_advert_stats.tpl
templates/de/html/menu/menu_member_advert_surfbar.tpl
templates/de/html/menu/menu_member_advert_themes.tpl
templates/de/html/online_now.tpl
templates/de/html/page_header.tpl
templates/de/html/redirect_url.tpl
templates/de/html/select/select_network_box.tpl
templates/de/html/show_bonus_header.tpl
templates/de/html/show_bonus_msg.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/sponsor/sponsor_what.tpl
templates/de/html/surfbar/surfbar_frame_banner.tpl
templates/de/html/surfbar/surfbar_frame_stats.tpl
templates/de/html/surfbar/surfbar_frame_textlinks.tpl
templates/de/html/surfbar/surfbar_frame_top.tpl
templates/de/html/surfbar/surfbar_frameset.tpl
templates/de/html/surfbar/surfbar_login_form.tpl
templates/de/html/surfbar/surfbar_start_banner.tpl
templates/de/html/surfbar/surfbar_stopped.tpl
templates/de/html/theme/theme_select_form.tpl
templates/de/html/uberwach/uberwach_snippet.tpl
templates/en/html/impressum.tpl
templates/en/html/register_header.tpl
theme/business/css/general.css
theme/business/css/mailid.css [new file with mode: 0644]
theme/default/css/general.css
theme/default/css/mailid.css [new file with mode: 0644]
theme/desert/css/general.css
theme/desert/css/mailid.css [new file with mode: 0644]

index c82c2dd..771eb88 100644 (file)
@@ -1652,6 +1652,7 @@ theme/business/css/doubler.css -text
 theme/business/css/general.css -text
 theme/business/css/imprint.css -text
 theme/business/css/install.css -text
+theme/business/css/mailid.css -text
 theme/business/css/register.css -text
 theme/business/css/sponsor.css -text
 theme/business/css/surfbar.css -text
@@ -1669,6 +1670,7 @@ theme/default/css/doubler.css -text
 theme/default/css/general.css -text
 theme/default/css/imprint.css -text
 theme/default/css/install.css -text
+theme/default/css/mailid.css -text
 theme/default/css/register.css -text
 theme/default/css/sponsor.css -text
 theme/default/css/surfbar.css -text
@@ -1686,6 +1688,7 @@ theme/desert/css/doubler.css -text
 theme/desert/css/general.css -text
 theme/desert/css/imprint.css -text
 theme/desert/css/install.css -text
+theme/desert/css/mailid.css -text
 theme/desert/css/register.css -text
 theme/desert/css/sponsor.css -text
 theme/desert/css/surfbar.css -text
diff --git a/beg.php b/beg.php
index b605c45..072f4b4 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -89,7 +89,7 @@ if (isGetRequestElementSet('userid')) {
                // numbers matching to the numbers behind the decimal dot. Simple! ;-)
                $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
 
-               // Set nickname / userid for the template(s
+               // Set nickname / userid for template
                $content['userid']      = getRequestElement('userid');
                $content['clicks']      = (getUserData('beg_clicks') + 1);
                $content['banner']      = loadTemplate('beg_banner', true);
index 78e19dd..5cdbd9f 100644 (file)
--- a/click.php
+++ b/click.php
@@ -11,7 +11,7 @@
  * Kurzbeschreibung  : Klicks auf Banner zaehlen und weiterleiten       *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
- * $Date::                                                             $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
index df17119..f9fec82 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -60,10 +60,10 @@ if ((isExtensionActive('debug')) && (getTotalFatalErrors() == '0')) {
 
                        // Is the module there? Else we log it!
                        if (isIncludeReadable($inc)) {
-                               // Load the request module
+                               // Load the requested module
                                loadInclude($inc);
                        } else {
-                               // Missing request file, may happen while development
+                               // Missing request files may happen while development
                                DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestElement('request'));
                        }
                } else {
index bbf6b45..b7e8169 100644 (file)
@@ -59,7 +59,7 @@ error_reporting(E_ALL | E_STRICT);
 // Detect path
 $PATH = str_replace("\\", '/', substr(dirname(__FILE__), 0, -3));
 
-// Configuration include file
+// Some very important function includes
 foreach (array('config','wrapper','inc','stats') as $inc) {
        require($PATH . 'inc/' . $inc . '-functions.php');
 } // END - foreach
index 75f97be..b5dcf2e 100644 (file)
@@ -47,7 +47,6 @@ addCode('WRONG_ID'         , 0x002);
 addCode('ID_LOCKED'        , 0x003);
 addCode('ID_UNCONFIRMED'   , 0x004);
 addCode('UNKNOWN_STATUS'   , 0x005);
-addCode('NO_COOKIES'       , 0x006);
 addCode('CNTR_FAILED'      , 0x008);
 addCode('LOGOUT_DONE'      , 0x008);
 addCode('LOGOUT_FAILED'    , 0x009);
index d1b7ead..dac2f79 100644 (file)
@@ -117,7 +117,7 @@ PRIMARY KEY  (`id`)
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_bonus` SET `target_send`=`mails_sent` WHERE `target_send`=0 AND `mails_sent`>0 AND `receivers` != ''");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <a href=\"{?URL?}/modules.php?module=admin&amp;what=updates\">Updates pr&uuml;fen</a> herunter.");
+                               setExtensionUpdateNotes("Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <strike>Updates pr&uuml;fen</strike> herunter.");
                                break;
 
                        case '0.2.1': // SQL queries for v0.2.1
index b7af7fa..1d70a59 100644 (file)
@@ -131,7 +131,7 @@ PRIMARY KEY (media_key)
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Start des {?mt_word2?} und Anzahl Anmeldungen aufgenommen. (Task #13)<br />
-Bitte stellen Sie diesen derzeit manuell unter <a href=\"{?URL?}/modules.php?module=admin&amp;what=config_mediadata\">Einstellungen-Medidata</a> selber einstellen.");
+Bitte stellen Sie diesen derzeit manuell unter <a href=\"%url=modules.php?module=admin&amp;what=config_mediadata%}\">Einstellungen-Medidata</a> selber einstellen.");
                                break;
 
                        case '0.0.8': // SQL queries for v0.0.8
index 92f4554..af8765d 100644 (file)
@@ -122,7 +122,7 @@ switch (getExtensionMode()) {
 
                        case '0.1.2': // SQL queries for v0.1.2
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <a href=\"{?URL?}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</a> m&uuml;ssen.<br />
+                               setExtensionUpdateNotes("Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <strike>meiner Seite herunterladen</strike> m&uuml;ssen.<br />
 <br />
 <strong>Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".getLanguage()."/html/member/ !) mit hoch!</strong>");
 
index 34c95ae..4c67e19 100644 (file)
@@ -209,7 +209,7 @@ PRIMARY KEY (id)
 
                        case '0.3.2': // SQL queries for v0.3.2
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <a href=\"{?URL?}/modules.php?module=admin&amp;what=extensions&amp;do=search\">meiner Seite herunterladen</a> m&uuml;ssen.<br />
+                               setExtensionUpdateNotes("Einbindung der Erweiterung <strong>country</strong>, die Sie sich noch optional von <strike>meiner Seite herunterladen</strike> m&uuml;ssen.<br />
 <br />
 <strong>Wichtig: Laden Sie noch das Template <strong>guest_register.tpl</strong> mit hoch, welches unter templates/".getLanguage()."/html/guest/ zu finden ist!</strong>");
 
index 93a0225..fc7388a 100644 (file)
@@ -214,7 +214,7 @@ switch (getExtensionMode()) {
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `index_cookie` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('ONE_DAY')*365)."");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Sie k&ouml;nnen nun <a href=\"{?URL?}/modules.php?module=admin&amp;`what`=config_home\">hier</a> die Verz&ouml;gerungszeit in der <a href=\"{?URL?}/index.php\">Eingangsseite</a> einstellen.");
+                               setExtensionUpdateNotes("Sie k&ouml;nnen nun <a href=\"{%url=modules.php?module=admin&amp;what=config_home%}\">hier</a> die Verz&ouml;gerungszeit in der <a href=\"{%url=index.php%}\">Eingangsseite</a> einstellen.");
                                break;
 
                        case '0.1.2': // SQL queries for v0.1.2
index 79462da..362898e 100644 (file)
@@ -414,7 +414,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
                                                $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
                                        } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
                                                // No config, try the language system
-                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\".getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
                                        } else {
                                                // Unhandled!
                                                $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
@@ -435,7 +435,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
        if ($compiled === true) {
                // Run the code
                $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";";
-               //* DEBUG: */ print '<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>';
+               //* DEBUG: */ print('<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>');
                eval($eval);
        } // END - if
 
@@ -448,34 +448,54 @@ function FILTER_COMPILE_EXTENSION ($code) {
        // Compile {%cmd=some_value%} to get extension data
        // Support cmd is:
        //   - version -> getExtensionVersion() call
-       preg_match_all('/\{%((([a-zA-Z0-9-_]+)=([a-zA-Z0-9-_]+))*)\%\}/', $code, $matches);
+       preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^%\}]+))%\}/', $code, $matches);
+       //* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
+
+       // Default is from OUTPUT_HTML
+       $outputMode = getOutputMode();
 
        // Some entries found?
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
-               foreach ($matches[3] as $key => $cmd) {
+               foreach ($matches[2] as $key => $cmd) {
                        // Init replacer variable
                        $replacer = '';
 
                        // Is the extension installed or code provided?
+                       // @TODO This whole if-block is very static
                        if ($cmd == 'code') {
                                // Code asked for
-                               $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\"";
+                               $replacer = "\" . getCode('" . $matches[3][$key] . "') . \"";
+                       } elseif (substr($cmd, 0, 3) == 'url') {
+                               // Do we have JS-mode?
+                               if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
+
+                               // Handle an URL here
+                               $replacer = "\" . encodeUrl('" . $matches[3][$key] . "', " . $outputMode . ") . \"";
+
+                               // Replace it
+                               $code = str_replace($matches[0][$key], $replacer, $code);
+
+                               // And continue with next entry
+                               continue;
                        } else {
                                // Construct call-back function name
                                $functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
                                // Construct call of the function
-                               $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+                               $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
                        }
 
                        // Replace it and insert parameter for GET request
-                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code);
+                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $cmd, $replacer), $code);
                } // END - foreach
        } // END - if
 
+       // Do we have non-HTML mode?
+       if ((getOutputMode() != '0') || ($outputMode != '0')) $code = html_entity_decode($code);
+
        // Return compiled code
-       //* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
+       //* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
        return $code;
 }
 
index 3ee5bdf..73928d9 100644 (file)
@@ -302,7 +302,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
                        } else {
                                // Add surrounding HTML comments to help finding bugs faster
                                $ret = '<!-- Template ' . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . " - End -->\n";
-                               $eval = '$ret = "' . escapeQuotes($ret) . '";';
+                               $eval = '$ret = "' . compileRawCode(escapeQuotes($ret)) . '";';
                        } // END - if
 
                        // Cache the eval() command here
@@ -862,7 +862,7 @@ function generateDerefererUrl ($URL) {
        // Don't de-refer our own links!
        if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
                // De-refer this link
-               $URL = '{?URL?}/modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
+               $URL = '{%url=modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL)) . '%}';
        } // END - if
 
        // Return link
@@ -872,7 +872,7 @@ function generateDerefererUrl ($URL) {
 // Generates an URL for the frametester
 function generateFrametesterUrl ($URL) {
        // Prepare frametester URL
-       $frametesterUrl = sprintf("{?URL?}/modules.php?module=frametester&amp;url=%s",
+       $frametesterUrl = sprintf("{%%url=modules.php?module=frametester&amp;url=%s%%}",
                encodeString(compileUriCode($URL))
        );
 
@@ -903,7 +903,7 @@ function countSelection ($array) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $DATA, $userid) {
-       return '<img border="0" alt="Code ' . $code . '" src="{?URL?}/mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '" />';
+       return '<img border="0" alt="Code ' . $code . '" src="{%url=mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '%}" />';
 }
 
 // Generates a timestamp (some wrapper for mktime())
@@ -927,18 +927,7 @@ function makeTime ($hours, $minutes, $seconds, $stamp) {
 // Redirects to an URL and if neccessarry extends it with own base URL
 function redirectToUrl ($URL) {
        // Compile out codes
-       eval('$URL = "' . compileRawCode($URL) . '";');
-
-       // Check if http(s):// is there
-       if ((substr($URL, 0, 7) != 'http://') && (substr($URL, 0, 8) != 'https://')) {
-               // Make all URLs full-qualified
-               $URL = getConfig('URL') . '/' . $URL;
-       } // END - if
-
-       // Three different debug ways...
-       //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
-       //* DEBUG: */ die($URL);
+       eval('$URL = "' . compileRawCode(encodeUrl($URL)) . '";');
 
        // Default 'rel' value is external, nofollow is evil from Google and hurts the Internet
        $rel = ' rel="external"';
@@ -957,6 +946,11 @@ function redirectToUrl ($URL) {
                clearOutputBuffer();
        } // END - if
 
+       // Three different ways to debug...
+       //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'URL=' . $URL);
+       //* DEBUG: */ die($URL);
+
        // Simple probe for bots/spiders from search engines
        if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
                // Secure the URL against bad things such als HTML insertions and so on...
@@ -1043,11 +1037,11 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
        if ($constants === true) {
                // BEFORE 0.2.1 : Language and data constants
                // WITH 0.2.1+  : Only language constants
-               $code = str_replace('{--', "\".getMessage('", str_replace('--}', "').\"", $code));
+               $code = str_replace('{--', "\" . getMessage('", str_replace('--}', "') . \"", $code));
 
                // BEFORE 0.2.1 : Not used
                // WITH 0.2.1+  : Data constants
-               $code = str_replace('{!', "\".constant('", str_replace("!}", "').\"", $code));
+               $code = str_replace('{!', "\" . constant('", str_replace('!}', "') . \"", $code));
        } // END - if
 
        // Compile QUOT and other non-HTML codes
@@ -1354,7 +1348,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
                debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length'));
        } elseif ($headerSent === false) {
                // Return an HTML code here
-               return "<img src=\"{?URL?}/img.php?code=" . $img_code."\" alt=\"Image\" />\n";
+               return "<img src=\"{%url=img.php?code=" . $img_code."%}\" alt=\"Image\" />\n";
        }
 
        // Load image
@@ -1667,13 +1661,13 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
                        $NAV .= '<strong>-';
                } else {
                        // Open anchor tag and add base URL
-                       $NAV .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
+                       $NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
 
                        // Add userid when we shall show all mails from a single member
                        if ((isGetRequestElementSet('userid')) && (bigintval(getRequestElement('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
                        // Close open anchor tag
-                       $NAV .= '">';
+                       $NAV .= '%}">';
                }
                $NAV .= $page;
                if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
@@ -1976,7 +1970,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
        $OUT = "[&nbsp;";
 
        foreach ($targetArray as $tar) {
-               $OUT .= "<span class=\"admin_user_link\"><a href=\"{?URL?}/modules.php?module=admin&amp;what=" . $tar . "&amp;userid=" . $userid . "\" title=\"{--ADMIN_LINK_";
+               $OUT .= "<span class=\"admin_user_link\"><a href=\"{%url=modules.php?module=admin&amp;what=" . $tar . "&amp;userid=" . $userid . "%}\" title=\"{--ADMIN_LINK_";
                //* DEBUG: */ outputHtml("*" . $tar.'/' . $status."*<br />");
                if (($tar == 'lock_user') && ($status == 'LOCKED')) {
                        // Locked accounts shall be unlocked
@@ -2635,8 +2629,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('ID_LOCKED')        : $message = getMessage('LOGIN_ID_LOCKED'); break;
                case getCode('ID_UNCONFIRMED')   : $message = getMessage('LOGIN_ID_UNCONFIRMED'); break;
                case getCode('ID_GUEST')         : $message = getMessage('LOGIN_ID_GUEST'); break;
-               case getCode('NO_COOKIES')       : $message = getMessage('LOGIN_NO_COOKIES'); break;
-               case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_NO_COOKIES'); break;
+               case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
                case getCode('BEG_SAME_AS_OWN')  : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
                case getCode('LOGIN_FAILED')     : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
                case getCode('MODULE_MEM_ONLY')  : $message = sprintf(getMessage('MODULE_MEM_ONLY'), getRequestElement('mod')); break;
@@ -3367,7 +3360,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                // Remove double slashes
                $FQFN = str_replace('//', '/', $FQFN);
 
-               // Check if the base filename matches an exclusion pattern and if the pattern is not empty
+               // Check if the base filenname matches an exclusion pattern and if the pattern is not empty
                if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) {
                        // These Lines are only for debugging!!
                        //* DEBUG: */ outputHtml('baseDir:' . $baseDir . '<br />');
@@ -3835,6 +3828,41 @@ function getModuleFromFileName ($file, $accessLevel) {
        return $modCheck;
 }
 
+// Encodes an URL for adding session id, etc.
+function encodeUrl ($url, $outputMode = '0') {
+       // Do we have already have a PHPSESSID inside? Then it is already converted...
+       if (strpos($url, session_name()) !== false) return $url;
+
+       // Do we have a valid session?
+       if ((($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
+               // Invalid session
+               // Determine right seperator
+               $seperator = '&amp;';
+               if (strpos($url, '?') === false) {
+                       // No question mark
+                       $seperator = '?';
+               } elseif ((getOutputMode() != '0') || ($outputMode != '0')) {
+                       // Non-HTML mode
+                       $seperator = '&';
+               }
+
+               // Add it to URL
+               $url .= $seperator . session_name() . '=' . session_id();
+       } // END - if
+
+       // Add {?URL?}
+       $url = '{?URL?}/' . $url;
+
+       // Return the URL
+       return $url;
+}
+
+// Simple check for spider
+function isSpider () {
+       // Is it a spider?
+       return ((strpos('spider', strtolower(detectUserAgent(true))) !== false) || (strpos('bot', strtolower(detectUserAgent(true))) !== false));
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
index 6cd5596..448853e 100644 (file)
@@ -219,7 +219,7 @@ addMessages(array(
        'REFID_BY' => "Sie wurden geworben von",
        'TERMS_OF_USAGE' => "AGBs zustimmen und absenden",
        'YOU_FINALIZE' => "Sie haben es gleich geschafft.",
-       'AGREE_TO_THIS' => "Stimmen Sie unseren [<a href=\"{?URL?}/modules.php?module=index&amp;what=agb\" class=\"register_term\" target=\"_blank\">AGBs</a>] zu?",
+       'AGREE_TO_THIS' => "Stimmen Sie unseren [<a href=\"{%url=modules.php?module=index&amp;what=agb%}\" class=\"register_term\" target=\"_blank\">AGBs</a>] zu?",
        'SUBMIT_REGISTER' => "Anmeldedaten abschicken",
        'HAVE_TO_AGREE' => "Sie m&uuml;ssen unseren AGBs zustimmen, damit Sie an diesem {?mt_word?} teilnehmen k&ouml;nnen.",
        'ENTER_BOTH_PASSWORDS' => "Bitte geben Sie ein Passwort und das selbe Passwort noch einmal ein.",
@@ -308,7 +308,7 @@ addMessages(array(
        'LOGIN_ID_LOCKED' => "Ihr Account wurde gesperrt.",
        'LOGIN_ID_UNCONFIRMED' => "Bitte best&auml;tigen Sie erst Ihre Email-Adresse! Haben Sie den Best&auml;tigungslink verloren? Links im Men&uuml; unter &quot;Best&auml;tigungslink&quot; k&ouml;nnen Sie ihn erneut anfordern.",
        'LOGIN_ID_GUEST' => "Es ist etwas beim Anmelden schief gelaufen. Dies sollte nicht vorkommen. status=guest",
-       'LOGIN_NO_COOKIES' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.",
+       'LOGIN_COOKIES_DISABLED' => "Sie haben in Ihrem Browser entweder die Cookies ausgeschaltet, oder die Sicherheitsstufe ist zu hoch eingestellt.",
        'GUEST_REG_POINTS_1' => "F&uuml;r Ihre Anmeldung haben wir Ihnen als Willkommensgutschrift",
        'GUEST_REG_POINTS_2' => "{?POINTS?} gutgeschrieben. Sie k&ouml;nnen bereits jetzt schon Mails an die anderen Mitglieder verschicken - solange Empf&auml;nger auch erreichbar sind.",
        'GUEST_SELECT_LIFETIME' => "Wie lange soll Auto-Login aktiv sein?",
@@ -532,7 +532,6 @@ addMessages(array(
        'MEMBER_PLEASE_RESPECT' => "Sollten Sie damit nicht einverstanden sein, so melden Sie sich bitte bei uns. Wir kommen dann in Kontakt mit Ihnen.",
        'ADMIN_LOCKED_SUBJ' => "Ihr Account wurde gesperrt.",
        'ADMIN_UNLOCKED_SUBJ' => "Ihr Account wurde wieder freigegeben.",
-       'ADMIN_UNLOCKED_YOUR_ACCOUNT' => "Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie k&ouml;nnen sich nun wieder unter folgender URL einloggen:\n\n{?URL?}/login.php",
        'REASON_UNLOCKED' => "Nachricht vom Admin",
        'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim naechsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.",
        'ADMIN_DEL_ACCOUNT' => "Loeschung Ihres Accounts.",
@@ -543,7 +542,7 @@ addMessages(array(
        'GUEST_CONFIRM_SUBJ' => "Bitte Ihre Email-Adresse best&auml;tigen.",
        'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet",
        'MEMBER_ORDER_REJECTED' => "Ihre Mailbuchung wurde abgelehnt",
-       'THANX_REFERAL_ONE' => "Vielen Dank f&uuml;r die Referal-Werbung.",
+       'THANX_REFERAL_ONE_SUBJECT' => "Vielen Dank f&uuml;r die Referal-Werbung.",
        'ADMIN_SEND_MAIL' => "Bonusmail versenden",
        'ADMIN_BONUS_SEND' => "Bonusmail wurde in den Sende-Pool eingef&uuml;gt.",
        'ENTER_POINTS' => "Verg&uuml;tung",
@@ -1040,9 +1039,9 @@ addMessages(array(
        'ADMIN_NO_POINTS_REPAYED' => "Die Mailbuchung hatte keine {?POINTS?} zum zur&uuml;ckbuchen.",
        'ADMIN_POINTS_SHREDDED' => "Es wurden <span class=\"data\">%s&nbsp; {?POINTS?}</span> geschrettert.",
        'EXTENSION_PROBLEM_EXT_INACTIVE' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> deaktiviert.",
-       'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{?URL?}/modules.php?module=admin&amp;what=extensions\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+       'ADMIN_EXTENSION_PROBLEM_EXT_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit deaktiviert. <a href=\"{%url=modules.php?module=admin&amp;what=extensions%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
        'EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Kann nicht fortfahren! Fehler: Erweiterung <span class=\"data\">%s</span> nicht installiert.",
-       'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{?URL?}/modules.php?module=admin&amp;what=extensions\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
+       'ADMIN_EXTENSION_PROBLEM_EXT_NOT_INSTALLED' => "Die Erweiterung <span class=\"data\">%s</span> ist derzeit nicht installiert. <a href=\"{%url=modules.php?module=admin&amp;what=extensions%}\">Hier</a> k&ouml;nnen Sie diese aktivieren.",
        'EXTENSION_PROBLEM_NOT_INSTALLED' => "Erweiterung <span class=\"data\">%s</span> nicht installiert.",
        'EXTENSION_PROBLEM_UNSET_EXT' => "Skriptfehler: Parameter <strong>ext</strong> nicht gesetzt.",
        'EXTENSION_WARNING_EXT_INACTIVE' => "Die Erweiterung <span class=\"data\">%s</span> ist nicht aktiv. Dies kann zu St&ouml;rungen f&uuml;hren.<br />\nBitte aktivieren Sie diese unter <em>Verschiedenes-&gt;Erweiterungen</em>.",
index abeb9e7..c176082 100644 (file)
@@ -115,8 +115,8 @@ addMessages(array(
        'DOUBLER_FORM_404_POINTS' => "Keine {?POINTS?} zum Verdoppeln eingegeben.",
        'DOUBLER_FORM_404_NICKNAME' => "Unbekannter Nickname eingegeben oder falsches Passwort.",
        'DOUBLER_FORM_404_MEMBER' => "Mitgliedsaccount nicht gefunden oder falsches Passwort.",
-       'DOUBLER_FORM_STATUS_UNCONFIRMED' => "Bitte best&auml;tigen Sie erst Ihre EMail-Adresse. Den Best&auml;tigungslink k&ouml;nnen Sie <a href=\"{?URL?}/modules.php?module=index&amp;what=confirm\">hier erneut per EMail anfordern</a> .",
-       'DOUBLER_FORM_STATUS_LOCKED' => "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte <a href=\"{?URL?}/modules.php?module=index&amp;what=impressum\">melden Sie sich bei uns</a>, damit wir Ihren Account freischalten k&ouml;nnen.",
+       'DOUBLER_FORM_STATUS_UNCONFIRMED' => "Bitte best&auml;tigen Sie erst Ihre EMail-Adresse. Den Best&auml;tigungslink k&ouml;nnen Sie <a href=\"{%url=modules.php?module=index&amp;what=confirm%}\">hier erneut per EMail anfordern</a> .",
+       'DOUBLER_FORM_STATUS_LOCKED' => "Ihr Account wurde von einem Administrator oder durch Urlaub gesperrt. Bitte <a href=\"{%url=modules.php?module=index&amp;what=impressum%}\">melden Sie sich bei uns</a>, damit wir Ihren Account freischalten k&ouml;nnen.",
        'DOUBLER_FORM_WRONG_PASS' => "Passwort ist falsch.",
        'DOUBLER_FORM_POINTS_MIN' => "Zu wenig {?POINTS?} zum Verdoppeln eingegeben.",
        'DOUBLER_FORM_POINTS_MAX' => "Zu viele {?POINTS?} zum Verdoppeln eingegeben.",
index 69e5a76..23dbcc7 100644 (file)
@@ -135,7 +135,7 @@ addMessages(array(
        'SPONSOR_PAYTYPE_VALUE' => "Bestellwert",
        'SPONSOR_PAYTYPE_COUNT' => "Bestellmenge",
        'GUEST_SPONSOR_RECEIVE_WARNINGS' => "Bei Daten&auml;nderung eine Best&auml;tigung per Mail erhalten?",
-       'SPONSOR_ACCEPT_TERMS' => "Ich/wir habe/n die [<strong><a href=\"{?URL?}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</a></strong>] gelesen und akzeptiert.",
+       'SPONSOR_ACCEPT_TERMS' => "Ich/wir habe/n die [<strong><a href=\"{%url=modules.php?module=index&amp;what=sponsor_agb%}\" target=\"_blank\">AGBs</a></strong>] gelesen und akzeptiert.",
        'SPONSOR_TERMS_HEADER' => "Allgemeine Gesch&auml;ftsbedingungen",
 
 // Add payment types
@@ -238,7 +238,7 @@ addMessages(array(
        'SPONSOR_TAX_IDENT_IS_EMPTY' => "Sie haben keine Ust-Ident-Nr. eingegeben.",
        'SPONSOR_REGISTER_SOMETHING_MISSING' => "Die Sponsorenanmeldung konnte wegen der folgenden Punkte nicht durchgef&uuml;hrt werden",
        'SPONSOR_PASSWORDS_MISMATCH' => "Die beiden von Ihnen eingegebenen Passw&ouml;rter stimmen nicht &uuml;berein.",
-       'SPONSOR_TERMS_NOT_ACCEPTED' => "Bitte akzeptieren Sie unsere [<strong><a href=\"{?URL?}/modules.php?module=index&amp;what=sponsor_agb\" target=\"_blank\">AGBs</a></strong>] .",
+       'SPONSOR_TERMS_NOT_ACCEPTED' => "Bitte akzeptieren Sie unsere [<strong><a href=\"{%url=modules.php?module=index&amp;what=sponsor_agb%}\" target=\"_blank\">AGBs</a></strong>] .",
        'SPONSOR_NO_PAYTYPE_SELECTED' => "Bitte w&auml;hlen Sie noch ein Buchungspaket aus.",
        'SPONSOR_NO_WARNING_INTERVAL_SELECTED' => "Bitte w&auml;hlen Sie noch den Zeitabstand zwischen zwei Sponsorenberichten aus.",
        'SPONSOR_NO_RECEIVE_WARNINGS_SELECTED' => "Bitte w&auml;hlen Sie noch aus, ob Sie bei jeder Aktion Best&auml;tigungsmails empfangen wollen oder nicht.",
@@ -276,7 +276,7 @@ addMessages(array(
        'SPONSOR_LOGIN_FAILED_LOCKED' => "Ihr Account wurde gesperrt, vermutlich wegen Nichteinhaltung von Regeln.",
        'SPONSOR_LOGIN_FAILED_EMAIL' => "Sie haben Ihre Email-Adresse ge&auml;ndert und diese noch nicht best&auml;tigt.",
        'SPONSPOR_COOKIE_SETUP_FAILED' => "Es konnten keine Cookies gesetzt werden. Bitte Sicherheitseinstellungen in Ihrem Browser &uuml;berpr&uuml;fen.",
-       'SPONSOR_ONLY_AREA_ENTERED' => "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [&nbsp;<strong><a href=\"{?URL?}/index.php\">Eingangsseite</a></strong>&nbsp;] zur&uuml;ck.",
+       'SPONSOR_ONLY_AREA_ENTERED' => "Sie haben einen Bereich aufgerufen, der nur den Sponsoren vorenthalten ist, die auch bezahlt haben. Bitte kehren Sie zur [&nbsp;<strong><a href=\"{%url=index.php%}\">Eingangsseite</a></strong>&nbsp;] zur&uuml;ck.",
        'SPONSOR_ACCOUNT_STATUS_FAILED' => "Unerwarteter Zustand des Scriptes erreicht! Bitte Support benachrichtigen.",
        'SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN' => "Ihr Sponsorenaccount ist wieder freigegeben! Sie k&ouml;nnen sich nun erneut einloggen.",
 
@@ -292,7 +292,7 @@ addMessages(array(
        'SPONSOR_ENTER_OLD_PASSWORD' => "Geben Sie Ihr derzeitiges Passwort ein",
        'SPONSOR_CHANGE_PASSWORD' => "Neues Passwort einstellen",
        'SPONSOR_ACCOUNT_DATA_SAVED' => "Ihre Daten wurden gespeichert.",
-       'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse ge&auml;ndert, Account wurde tempor&auml;r gesperrt. Bitte [<a href=\"{?URL?}/index.php\">hier klicken</a>], um in den Gastbereich zu gelangen.",
+       'SPONSOR_ACCOUNT_EMAIL_CHANGED' => "Sie haben Ihre EMail-Adresse ge&auml;ndert, Account wurde tempor&auml;r gesperrt. Bitte [<a href=\"{%url=index.php%}\">hier klicken</a>], um in den Gastbereich zu gelangen.",
        'SPONSOR_SETTINGS_HEADER' => "Einstellungen Ihres Sponsorenaccounts",
        'SPONSOR_UNKNOWN_WHAT' => "Scripte-Fehler: Unbekannte Sponsor-Aktion <span class=\"data\">%s</span> erkannt.",
        'SPONSOR_SETTINGS_SAVED' => "Neue Einstellungen gespeichert.",
index 2eab380..bdc32fa 100644 (file)
@@ -47,7 +47,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST () {
        if (isExtensionActive('online')) {
                // Init content
                $content = array(
-                       'menu' => "<a class=\"menu_blur\" href=\"{?URL?}/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').getMessage('GUEST_ACTIVE_LINK')."</a>",
+                       'menu' => "<a class=\"menu_blur\" href=\"{%url=modules.php?module=index&amp;what=active%}\">".getConfig('menu_blur_spacer').getMessage('GUEST_ACTIVE_LINK')."</a>",
                        'what' => 'active'
                );
 
index ce02418..d9aa9f8 100644 (file)
@@ -139,14 +139,14 @@ LIMIT 1",
                        list($adminId) = SQL_FETCHROW($result);
 
                        // Rewrite email address to contact link
-                       $email = "{?URL?}/modules.php?module=".$mod."&amp;what=admins_contct&amp;admin=".bigintval($adminId);
+                       $email = '{%url=modules.php?module=' . $mod . '&amp;what=admins_contct&amp;admin=' . bigintval($adminId) . '%}';
                } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
        } elseif ((is_int($email)) && ($email > 0)) {
                // Direct id given
-               $email = "{?URL?}/modules.php?module=".$mod."&amp;what=admins_contct&amp;admin=".bigintval($email);
+               $email = '{%url=modules.php?module=' . $mod . '&amp;what=admins_contct&amp;admin=' . bigintval($email) . '%}';
        }
 
        // Return rewritten (?) email address
index 10298ce..0d9b52f 100644 (file)
@@ -86,7 +86,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
 
        if ($value > 0) {
-               $content['update_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>";
+               $content['update_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}\">".$value."</a>";
        } // END - if
 
        //
@@ -96,21 +96,21 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
 
        if ($value > 0) {
-               $content['confirmed_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>";
+               $content['confirmed_members'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_user&amp;status=confirmed%}\">".$value."</a>";
        } // END - if
 
        // Unconfirmed accounts
        $value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
 
        if ($value > 0) {
-               $content['unconfirmed_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>";
+               $content['unconfirmed_members'] = "<a href=\"{%url=modules.php?module=admin&amp;what=chk_regs%}\">".$value."</a>";
        } // END - if
 
 
        // And locked accounts
        $value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
        if ($value > 0) {
-               $content['locked_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>";
+               $content['locked_members'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}\">".$value."</a>";
        } // END - if
 
        //
@@ -119,7 +119,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
 
        if ($value > 0) {
-               $content['new_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>";
+               $content['new_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}\">".$value."</a>";
        } // END - if
 
        //
@@ -128,7 +128,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
 
        if ($value > 0) {
-               $content['closed_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>";
+               $content['closed_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}\">".$value."</a>";
        } // END - if
 
        //
@@ -137,7 +137,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
 
        if ($value > 0) {
-               $content['deleted_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>";
+               $content['deleted_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}\">".$value."</a>";
        } // END - if
 
        //
@@ -146,7 +146,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
 
        if ($value > 0) {
-               $content['solved_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>";
+               $content['solved_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}\">".$value."</a>";
        } // END - if
 
        //
@@ -155,7 +155,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
 
        if ($value > 0) {
-               $content['your_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task\">".$value."</a>";
+               $content['your_tasks'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_task%}\">".$value."</a>";
        } // END - if
 
        //
@@ -164,7 +164,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['pending_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>";
+               $content['pending_mails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=unlock_emails%}\">".$value."</a>";
        } // END - if
 
        //
@@ -173,7 +173,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['canceled_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+               $content['canceled_mails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=email_details%}\">".$value."</a>";
        } // END - if
 
        //
@@ -182,7 +182,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['send_emails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>";
+               $content['send_emails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=email_archiv%}\">".$value."</a>";
        } // END - if
 
        //
@@ -193,7 +193,7 @@ function outputAdvancedOverview (&$result_main) {
                $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
 
                if ($value > 0) {
-                       $content['purged_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                       $content['purged_mails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=email_details%}\">".$value."</a>";
                } // END - if
 
                //
@@ -204,7 +204,7 @@ function outputAdvancedOverview (&$result_main) {
                        $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
 
                        if ($value > 0) {
-                               $content['purged_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                               $content['purged_bonus_mails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=email_details%}\">".$value."</a>";
                        } // END - if
                } elseif (isExtensionActive('bonus')) {
                        $content['purged_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
@@ -224,7 +224,7 @@ function outputAdvancedOverview (&$result_main) {
                $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
 
                if ($value > 0) {
-                       $content['send_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                       $content['send_bonus_mails'] = "<a href=\"{%url=modules.php?module=admin&amp;what=email_details%}\">".$value."</a>";
                } // END - if
        } elseif (isExtensionActive('bonus')) {
                $content['send_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
@@ -578,7 +578,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 
                        if (($value > 0) && (!empty($WHATs[$key]))) {
                                if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
-                               $content['row_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
+                               $content['row_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=".$WHATs[$key]."%}\" title=\"".$TITLEs[$key]."%}\">".$value."</a>";
                        } else {
                                $content['row_link'] = '0';
                        }
index ed45abc..e39f97f 100644 (file)
@@ -4,7 +4,7 @@
  * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : theme-manager.php                                *
+ * File              : theme manager.php                                *
  * -------------------------------------------------------------------- *
  * Short description : Theme manager                                    *
  * -------------------------------------------------------------------- *
@@ -48,8 +48,9 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = "{?URL?}/modules.php?module=" . $mod;
+       $formAction = "{%url=modules.php?module=" . $mod;
        if (!empty($what)) $formAction .= "&amp;what=" . $what;
+       $formAction = '%}';
 
        // Initialize array
        $themesArray = array(
index 75d9fe3..ef11726 100644 (file)
@@ -57,9 +57,9 @@ function alpha ($sortby, $colspan, $return=false) {
                        $OUT .= '<strong>' . $ltr . '</strong>';
                } else {
                        // Output link to letter
-                       $OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat();
+                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
                        if (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
-                       $OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '">' . $ltr . '</a>';
+                       $OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
                }
 
                if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -113,7 +113,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
                if ($sortby == $sort) {
                        $OUT .= '<strong>' . $title . '</strong>&nbsp;|&nbsp;';
                } else {
-                       $OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '">' . $title . '</a>&nbsp;|&nbsp;';
+                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '%}">' . $title . '</a>&nbsp;|&nbsp;';
                }
        } // END - foreach
 
@@ -154,14 +154,14 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false)
                        if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid');
 
                        // Base link
-                       $OUT .= '<a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat();
+                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                        // Add status or mode
                        if (isGetRequestElementSet('status'))    $OUT .= '&amp;mode=' . getRequestElement('status');
                         elseif (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
 
                        // Letter and so on
-                       $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '">';
+                       $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
                }
 
                $OUT .= $page;
@@ -210,7 +210,7 @@ LIMIT 1",
                list($userid) = SQL_FETCHROW($result);
 
                // Rewrite email address to contact link
-               $email = '{?URL?}/modules.php?module=' . $mod . '&amp;what=user_contct&amp;userid=' . bigintval($userid);
+               $email = '{%url=modules.php?module=' . $mod . '&amp;what=user_contct&amp;userid=' . bigintval($userid) . '%}';
        } // END - if
 
        // Free memory
@@ -221,6 +221,7 @@ LIMIT 1",
 }
 
 // Selects a random user id as the new referal id if they have at least X confirmed mails in this run
+// @TODO Double-check configuration entry here
 function determineRandomReferalId () {
        // Default is zero refid
        $refid = '0';
@@ -367,7 +368,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                }
                        } else {
                                // Cookies not setable!
-                               $errorCode = getCode('NO_COOKIES');
+                               $errorCode = getCode('COOKIES_DISABLED');
                        }
                } elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
                        // Update failture counter
index d1b8d62..e1a87b4 100644 (file)
@@ -235,7 +235,7 @@ if (!isAdminRegistered()) {
 
                        case 'pass': // Wrong password
                                setRequestPostElement('ok', $ret);
-                               $ret = '{--WRONG_PASS--} [<a href="{?URL?}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASS--}</a>]';
+                               $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
                                break;
 
index ca8bf8c..327e511 100644 (file)
@@ -377,7 +377,7 @@ ORDER BY
                                        if (($menu == $action) && (empty($what))) {
                                                $OUT .= '<strong>';
                                        } else {
-                                               $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;action=' . $menu . '">';
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
                                        $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_ACTION_404--}">';
@@ -447,7 +447,7 @@ ORDER BY
                                                                if ($what == $what_sub) {
                                                                        $OUT .= '<strong>';
                                                                } else {
-                                                                       $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what_sub . '">';
+                                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
                                                                $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_WHAT_404--}">';
@@ -730,7 +730,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
        }
 
        // Return link
-       return '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+       return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
 }
 
 // Check "logical-area-mode"
@@ -1323,11 +1323,11 @@ function adminCreateUserLink ($userid) {
        // Is the userid set correctly?
        if ($userid > 0) {
                // Create a link to that profile
-               return '{?URL?}/modules.php?module=admin&amp;what=list_user&amp;userid='.bigintval($userid);
+               return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid='.bigintval($userid) . '%}';
        } // END - if
 
        // Return a link to the user list
-       return '{?URL?}/modules.php?module=admin&amp;what=list_user';
+       return '{%url=modules.php?module=admin&amp;what=list_user%}';
 }
 
 // Generate a "link" for the given admin id (admin_id)
index d7e8bbd..56e36a0 100644 (file)
@@ -247,13 +247,13 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                        $data['navi'] = '';
                        if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
                                // Is highest position
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']+1) . "&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        } elseif ($cnt == $max) {
                                // Is lowest position
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']-1) . "&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>";
                        } elseif ($data['sort'] > 0) {
                                // Anything else between highest and lowest
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>/<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']-1) . "&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>/<a href=\"{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']+1) . "&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        }
 
                        // Fix empty elements for constant (fixes display bugs in Firefox)
index 0c6d06d..6a5b66f 100644 (file)
@@ -39,7 +39,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -49,7 +49,7 @@ if ((isFormSent()) && (isGetRequestElementSet('admin'))) {
        if ((isExtensionActive('msg')) && (postRequestElement('type') == 'message')) {
                // Add message
                $message = loadEmailTemplate('admins_msg_contct_admin', postRequestElement('text'), 0);
-               SEND_ADMIN_MESSAGE(getRequestElement('admin'), ADMINS_MSG_FROM_ADMIN, $message);
+               sendAdminMessage(getRequestElement('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
        } else {
                // Load admin's email address
                $email = getAdminEmail(bigintval(getRequestElement('admin')));
index b9fe759..05c5f93 100644 (file)
@@ -55,7 +55,7 @@ switch ($sub) {
                        adminSaveSettingsFromPostData();
 
                        // Display continue link
-                       loadTemplate('admin_settings_saved', false, "<a href=\"{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">{--ADMIN_CONTINUE_TO_CONFIG--}</a>");
+                       loadTemplate('admin_settings_saved', false, "<a href=\"{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}\">{--ADMIN_CONTINUE_TO_CONFIG--}</a>");
                } else {
                        // Prepare data for the template
                        $content = array_fill(-1, 60, '');
@@ -88,13 +88,13 @@ ORDER BY `sort` ASC", __FILE__, __LINE__);
                // Process all entries
                while ($content = SQL_FETCHARRAY($result)) {
                        // Link for setting 'what' as new "home"
-                       $newHomeLink = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$content['what']."\">{--_IS_NEW_HOME--}</a>";
+                       $newHomeLink = "<a href=\"{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=" . $content['what'] . "%}\">{--_IS_NEW_HOME--}</a>";
 
                        // Is this current home?
                        if ($content['what'] == getConfig('index_home')) {
                                // Is current home
-                               $newHomeLink = "<div class=\"admin_mark\">{--_IS_CURRENT_HOME--}</div>";
-                               $content['title'] = "<div class=\"admin_mark\">".$content['title']."</div>";
+                               $newHomeLink      = "<div class=\"admin_mark\">{--_IS_CURRENT_HOME--}</div>";
+                               $content['title'] = "<div class=\"admin_mark\">" . $content['title'] . "</div>";
                        } // END - if
 
                        // Prepare content
index 6e3b2c5..d2605ec 100644 (file)
@@ -128,8 +128,8 @@ ORDER BY module', __FILE__, __LINE__);
                if (empty($content['title'])) $content['title'] = '---';
                if (($content['module'] == 'index') || ($content['module'] == 'login')) {
                        // Add link to detail statistics
-                       $content['module'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$content['module']."\">".$content['module']."</a></strong>";
-               }
+                       $content['module'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=" . $content['module'] . "%}\">" . $content['module'] . "</a></strong>";
+               } // END - if
 
                // Prepare array for the template
                // @TODO Rewritings: mod->module in template
index 41ddaf4..461184e 100644 (file)
@@ -236,7 +236,7 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
 // Does your members request payouts?
 if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        // Members has requested payouts
-       loadTemplate('admin_settings_saved', false, "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_payouts\">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a></P>");
+       loadTemplate('admin_settings_saved', false, "<a href=\"{%url=modules.php?module=admin&amp;what=list_payouts%}\">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a></P>");
 } elseif ($display) {
        // No member requests so far
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS'));
index d2933e6..d2d3605 100644 (file)
@@ -150,7 +150,7 @@ LIMIT 1",
                        loadTemplate('admin_config_rallye_edit', false, $content);
                } else {
                        // Nothing selected
-                       $content = sprintf(getMessage('RALLYE_NO_PRICES_SELECTED'), "<a href=\"{?URL?}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".getRequestElement('rallye')."\">", "</a>");
+                       $content = sprintf(getMessage('RALLYE_NO_PRICES_SELECTED'), "<a href=\"{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".getRequestElement('rallye')."%}\">", "</a>");
                        loadTemplate('admin_settings_saved', false, $content);
                }
        } elseif (isPostRequestElementSet('del')) {
@@ -189,7 +189,7 @@ LIMIT 1",
                        loadTemplate('admin_config_rallye_del', false, $content);
                } else {
                        // Nothing selected
-                       $content = "{--RALLYE_NO_PRICES_SELECTED_1--}<a href=\"{?URL?}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".getRequestElement('rallye')."\">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}";
+                       $content = "{--RALLYE_NO_PRICES_SELECTED_1--}<a href=\"{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".getRequestElement('rallye')."%}\">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}";
                        loadTemplate('admin_settings_saved', false, $content);
                }
        } else {
index 5892bc0..eada999 100644 (file)
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Configuration of transfer system                 *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Konfiguration des Punktetransfersystems          *
+ * Kurzbeschreibung  : Konfiguration des Punktetransfer-Systems         *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
index d6e0898..8a624fa 100644 (file)
@@ -141,7 +141,7 @@ LIMIT 1",
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link
-                       loadTemplate('admin_settings_saved', false, "<a href=\"{?URL?}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval(getRequestElement('mid'))."\">{--ADMIN_REMOVE_STATS_ENTRY--}</a>");
+                       loadTemplate('admin_settings_saved', false, "<a href=\"{%url=modules.php?module=admin&amp;what=del_email&amp;pid=" . bigintval(getRequestElement('mid')) . "%}\">{--ADMIN_REMOVE_STATS_ENTRY--}</a>");
                } // END - if
 
                // Free the result
index b1e95ed..5e75ebb 100644 (file)
@@ -104,7 +104,7 @@ if (SQL_NUMROWS($result) > 0) {
                $pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file
-                       $pool['unconfirmed'] = '<strong><a href="{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '">' . $pool['unconfirmed'] . '</a></strong>';
+                       $pool['unconfirmed'] = '<strong><a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '%}">' . $pool['unconfirmed'] . '</a></strong>';
                } // END - if
 
                // Prepare data for the row template
index 8a27a5b..8a1a30c 100644 (file)
@@ -152,7 +152,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file
-                       $pool['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
+                       $pool['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=" . $pool['id'] . "%}\">" . $pool['unconfirmed'] . "</a></strong>";
                } elseif ($pool['unconfirmed'] < 0) {
                        // Sometimes rarely displayed minus values will be "fixed" to zero
                        $pool['unconfirmed'] = '0';
@@ -208,7 +208,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
-                               $bonus['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=" . $bonus['id'] . "%}\">" . $bonus['unconfirmed'] . "</a></strong>";
                        } // END - if
 
                        // Prepare content
index 38841cb..31ded21 100644 (file)
@@ -286,13 +286,13 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
                        $cnt++;
                        if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
                                // Is highest position
-                               $NAVI = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=guestedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $NAVI = "<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']+1) . "&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        } elseif ($cnt == $max) {
                                // Is lowest position
-                               $NAVI = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=guestedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>";
+                               $NAVI = "<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']-1) . "&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>";
                        } elseif ($data['sort'] > 0) {
                                // Anything else between highest and lowest
-                               $NAVI = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=guestedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>/<a href=\"{?URL?}/modules.php?module=admin&amp;what=guestedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $NAVI = "<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']-1) . "&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>/<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']+1) . "&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        }
 
                        if (empty($data['action'])) $data['action'] = '&nbsp;';
index de08177..308ed2f 100644 (file)
@@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) {
                $content = getUserDataArray();
 
                // Prepare constants
-               // @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{?URL?}/modules.php?module=admin&amp;userid=");
+               // @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{%url=modules.php?module=admin&amp;userid=");
                $content['userid']       = bigintval(getRequestElement('userid'));
                $content['member_links'] = generateMemberAdminActionLinks($content['userid']);
                $content['email']        = "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['surname']." ".$content['family']."</a>";
index add9a8d..ecd2457 100644 (file)
@@ -75,7 +75,7 @@ switch (getRequestElement('mode')) {
                if ($cnt > 0) {
                        // Something was payed out
                        $sumAlready += $cnt;
-                       $content['already_direct_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct\">".$cnt."</a>";
+                       $content['already_direct_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct%}\">".$cnt."</a>";
                } // END - if
 
                $cnt = countSumTotalData('Y','doubler','id','completed',true, " AND `is_ref`='Y'");
@@ -83,7 +83,7 @@ switch (getRequestElement('mode')) {
                if ($cnt > 0) {
                        // Something was payed out
                        $sumAlready += $cnt;
-                       $content['already_ref_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref\">".$cnt."</a>";
+                       $content['already_ref_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref%}\">".$cnt."</a>";
                } // END - if
 
                // And the same for waiting pouts (direct and referal)
@@ -92,7 +92,7 @@ switch (getRequestElement('mode')) {
                if ($cnt > 0) {
                        // Something was payed out
                        $sumWaiting += $cnt;
-                       $content['waiting_direct_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct\">".$cnt."</a>";
+                       $content['waiting_direct_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct%}\">".$cnt."</a>";
                } // END - if
 
                $cnt = countSumTotalData('N','doubler','id','completed',true, " AND `is_ref`='Y'");
@@ -100,12 +100,12 @@ switch (getRequestElement('mode')) {
                if ($cnt > 0) {
                        // Something was payed out
                        $sumWaiting += $cnt;
-                       $content['waiting_ref_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref\">".$cnt."</a>";
+                       $content['waiting_ref_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref%}\">".$cnt."</a>";
                } // END - if
 
                // Links for all
-               $content['already_all_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all\">".$sumAlready."</a>";
-               $content['waiting_all_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all\">".$sumWaiting."</a>";
+               $content['already_all_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all%}\">".$sumAlready."</a>";
+               $content['waiting_all_link'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all%}\">".$sumWaiting."</a>";
 
                // All data is loaded here...
                break;
index 43eda25..69c19b7 100644 (file)
@@ -100,14 +100,14 @@ if (isGetRequestElementSet('userid')) {
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id)), __FILE__, __LINE__);
                                                        $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
-                                                       $LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
+                                                       $LINK = "<a href=\"{%url=mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."%}\" target=\"_blank\">".$id."</a>";
                                                        break;
 
                                                case 'BONUS':
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id2)), __FILE__, __LINE__);
                                                        $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
-                                                       $LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+                                                       $LINK = "<a href=\"{%url=mailid.php?userid=".getRequestElement('userid')."&amp;bonusid=".$id2."%}\" target=\"_blank\">".$id2."</a>";
                                                        break;
 
                                                default: // Problem in application detected!
index 5a83478..1f6fd0d 100644 (file)
@@ -91,7 +91,7 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
-                               $bonus['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=" . $bonus['id'] . "%}\">" . $bonus['unconfirmed'] . "</a></strong>";
                        } // END - if
 
                        // Prepare content
index df76022..1e53c99 100644 (file)
@@ -234,7 +234,7 @@ ORDER BY
                while ($content = SQL_FETCHARRAY($result)) {
                        if ($content['status'] == 'NEW') {
                                // Generate links for direct accepting and rejecting
-                               $content['status'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$content['id']."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$content['id']."\">".PAYOUT_REJECT_PAYOUT."</a>";
+                               $content['status'] = "<a href=\"{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=" . $content['id'] . "%}\">{--PAYOUT_ACCEPT_PAYOUT--}</a>&nbsp;|&nbsp;<a href=\"{%url=modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=" . $content['id'] . "%}\">{--PAYOUT_REJECT_PAYOUT--}</a>";
                        } else {
                                // Translate status
                                $content['status'] = getMessage('PAYOUT_STATUS_'.strtoupper($content['status']).'');
index e8cefeb..f495c7a 100644 (file)
@@ -306,7 +306,7 @@ ORDER BY
                        // Did some users joined this rallye?
                        if ($joined > 0) {
                                // List joined users
-                               $joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$data['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
+                               $joined = "<a href=\"{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=" . $data['id'] . "%}\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
                        } // END - if
 
                        // Alter some variables
index c9ac613..a6e2d3c 100644 (file)
@@ -124,7 +124,7 @@ ORDER BY
                        SQL_FREERESULT($result);
                } else {
                        // No refs made so far
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval(getRequestElement('rid'))."\">".bigintval(getRequestElement('rid'))."</a>"));
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_REFS_404'), "<a href=\"{%url=modules.php?module=admin&amp;what=list_sponsor&amp;id=" . bigintval(getRequestElement('rid')) . "%}\">" . bigintval(getRequestElement('rid')) . "</a>"));
                }
        } else {
                // Sponsor not found
index 6349a41..680c759 100644 (file)
@@ -90,7 +90,7 @@ if (!isGetRequestElementSet('sortby')) { setRequestGetElement('sortby', 'userid'
 if (!isGetRequestElementSet('page'))   { setRequestGetElement('page'  , 1);                 }
 
 // Set base URL
-$base = '[<a href="{?URL?}/modules.php?module=admin';
+$base = '[<a href="{%url=modules.php?module=admin';
 
 if (isGetRequestElementSet('userid')) {
        // Secure the user id
@@ -117,10 +117,10 @@ LIMIT 1",
                $content['links'] = countSumTotalData($userid, 'user_links', 'id', 'userid', true);
 
                // Add links to the numbers
-               if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '">' . $content['links'] . '</a>]';
-               if ($content['refid'] > 0) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '">'.$content['refid'] . '</a>]';
-               if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '">' . $content['refs'] . '</a>]';
-               if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '">' . $content['cats'] . '</a>]';
+               if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '%}">' . $content['links'] . '</a>]';
+               if ($content['refid'] > 0) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
+               if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . $content['refs'] . '</a>]';
+               if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . $content['cats'] . '</a>]';
 
                // Fix empty module
                if (empty($content['last_module'])) $content['last_module'] = '---';
@@ -144,7 +144,7 @@ LIMIT 1",
                $content['status']            = translateUserStatus($content['status']);
                $content['last_online']       = generateDateTime($content['last_online'], 0);
                $content['used_points']       = translateComma($content['used_points']);
-               if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '">' . translateComma($content['emails_sent']) . '</a>]';
+               if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . '</a>]';
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
@@ -300,10 +300,10 @@ LIMIT 1",
 
                        // Get number of unconfirmed mails
                        $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true);
-                       if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '">' . translateComma($content['links']) . '</a>]';
+                       if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . '</a>]';
 
                        // Set link to sent mails if present
-                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '">' . translateComma($content['emails_sent']) . '</a>]';
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . '</a>]';
 
                        // Add nickname
                        if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['nickname'] = '---';
@@ -321,7 +321,7 @@ LIMIT 1",
                        $content['sw']             = $SW;
                        $content['userid_link']    = generateUserProfileLink($content['userid']);
                        $content['gender']         = translateGender($content['gender']);
-                       $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
+                       $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '%}">' . $content['email'] . '</a>]';
                        $content['alinks']         = generateMemberAdminActionLinks($content['userid'], $content['status']);
                        $content['points']         = translateComma($content['points']);
                        $content['rate']           = translateComma($content['rate']);
@@ -331,7 +331,7 @@ LIMIT 1",
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
 
                        // If we have at least one referal, make it clickable to referal list
-                       if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '">' . $content['refs'] . '</a>]';
+                       if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">' . $content['refs'] . '</a>]';
 
                        // Is the lock reason not set?
                        if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
index 385aa6f..f87ef50 100644 (file)
@@ -101,7 +101,7 @@ if (isGetRequestElementSet('access')) {
                        $file = basename($file);
 
                        // Okay, add it
-                       outputHtml('<li><a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;access=' . urlencode($file) . '">' . $file . '</a></li>');
+                       outputHtml('<li><a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;access=' . urlencode($file) . '%}">' . $file . '</a></li>');
                } // END - foreach
 
                // Finish list
index 0d5f0e4..3ea041b 100644 (file)
@@ -263,13 +263,13 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
                        $cnt++;
                        if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
                                // Is highest position
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=memedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=".($data['sort']+1)."&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        } elseif ($cnt == $max) {
                                // Is lowest position
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=memedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=".($data['sort']-1)."&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>";
                        } elseif ($data['sort'] > 0) {
                                // Anything else between highest and lowest
-                               $data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>/<a href=\"{?URL?}/modules.php?module=admin&amp;what=memedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+                               $data['navi'] = "<a href=\"{%url=modules.php?module=admin&amp;what=memedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=".($data['sort']-1)."&amp;fid=" . $data['sort'] . "%}\">{--HIGHER--}</a>/<a href=\"{%url=modules.php?module=admin&amp;what=memedit&amp;sub=" . $content['sub'] . "&amp;act=" . $data['action'] . "&amp;w=" . $data['what'] . "&amp;tid=" . ($data['sort']+1) . "&amp;fid=" . $data['sort'] . "%}\">{--LOWER--}</a>";
                        }
 
                        // Fix empty values for Firefox
index 59101e2..80ba39b 100644 (file)
@@ -78,7 +78,7 @@ if ((getRequestElement('mod') == 'index') || (getRequestElement('mod') == 'login
 
                if (($content['module'] == 'index') || ($content['module'] == 'login')) {
                        // Add link to detail statistics
-                       $content['module'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$content['module']."\">".$content['module']."</a></strong>";
+                       $content['module'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=" . $content['module'] . "%}\">" . $content['module'] . "</a></strong>";
                } // END - if
 
                // Add color switch
index 276a553..9e4ae15 100644 (file)
@@ -124,7 +124,7 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Is the loaded theme name != current theme name?
                $LINK = $content['theme_path'];
-               if ($content['theme_path'] != getCurrentTheme()) $LINK = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$content['theme_path']."\" title=\"{--ADMIN_SET_AS_NEW_THEME--}\">".$content['theme_path']."</a>";
+               if ($content['theme_path'] != getCurrentTheme()) $LINK = "<a href=\"{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$content['theme_path']."%}\" title=\"{--ADMIN_SET_AS_NEW_THEME--}\">".$content['theme_path']."</a>";
 
                // Prepare data for the row template
                $content = array(
index d8a74e6..b46ea6d 100644 (file)
@@ -89,14 +89,11 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        // Until here...
 
        // Replace URLs
-       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=usage&image=usage', $content);
-       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=daily&image='     , $content);
-       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=hourly&image='    , $content);
-       $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=ctry&image='      , $content);
-       $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&usage='                , str_replace('.html', '', $content));
-
-       // @TODO Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&amp;url=http://", $content);
+       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=usage&amp;image=usage', $content);
+       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=daily&amp;image='     , $content);
+       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=hourly&amp;image='    , $content);
+       $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=ctry&amp;image='      , $content);
+       $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;usage='                , str_replace('.html', '', $content));
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
index 8bb5527..99c0ba0 100644 (file)
@@ -83,11 +83,11 @@ if (SQL_NUMROWS($result) == 1) {
                // Rallye will expire in less one day!
                $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
        } else {
-               $content['extras'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=register\">{--RALLYE_REGISTER_NOW--}</a>";
+               $content['extras'] = "<a href=\"{%url=modules.php?module=index&amp;what=register%}\">{--RALLYE_REGISTER_NOW--}</a>";
        }
 
        // Set admin line (currently set to impressum, later to contact form)
-       // @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$adminId."\">".$login."</a>";
+       // @TODO Reactivate this: $content['admin'] = "<a href=\"{%url=modules.php?module=index&amp;what=impressum&amp;admin=" . $adminId . "%}\">" . $login . "</a>";
 
        // Set title
        $content['title'] = $title;
index 15bab70..f984455 100644 (file)
@@ -49,5 +49,5 @@ addMenuDescription('member', __FILE__);
 // Loads the name-matching template
 loadTemplate(substr(basename(__FILE__), 5, -4));
 
-//
+// [EOF]
 ?>
index 3ff0675..d401069 100644 (file)
@@ -82,11 +82,11 @@ if (SQL_NUMROWS($result) == 1) {
                $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
        } else {
                // Link to referal links page
-               $content['extras'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=reflinks\">{--RALLYE_GET_REFLINK--}</a>";
+               $content['extras'] = "<a href=\"{%url=modules.php?module=login&amp;what=reflinks%}\">{--RALLYE_GET_REFLINK--}</a>";
        }
 
        // Set admin line (currently set to impressum, later to contact form)
-       // @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$content['admin_id']."\">".$content['login']."</a>";
+       // @TODO Reactivate this: $content['admin'] = "<a href=\"{%url=modules.php?module=index&amp;what=impressum&amp;admin=" . $content['admin_id'] . "%}\">" . $content['login'] . "</a>";
 
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
index f5e17ed..48b0f13 100644 (file)
@@ -76,7 +76,7 @@ if ((isFormSent()) && (isPostRequestElementSet(('action'))) && (isPostRequestEle
                $content['url'] = generateDerefererUrl($content['url']);
                if ($content['views_total'] > 0) {
                        // Include link to stats
-                       $content['views_total'] = "[<a href=\"{?URL?}/modules.php?module=login&amp;what=surfbar_list\">".translateComma($content['views_total'])."</a>]";
+                       $content['views_total'] = "[<a href=\"{%url=modules.php?module=login&amp;what=surfbar_list%}\">".translateComma($content['views_total'])."</a>]";
                } // END - if
                $content['registered']  = generateDateTime($content['registered'], 2);
                $content['last_locked'] = generateDateTime($content['last_locked'], 2);
index e21e5b0..cbafb61 100644 (file)
@@ -181,7 +181,7 @@ switch ($mode) {
                                sendAdminNotification($ADMIN_SUBJ, 'admin_transfer_points', $content);
 
                                // Transfer is completed
-                               loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "<br /><a href=\"{?URL?}/modules.php?module=login&amp;what=transfer\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
+                               loadTemplate('admin_settings_saved', false, getMessage('TRANSFER_COMPLETED') . "<br /><a href=\"{%url=modules.php?module=login&amp;what=transfer%}\">{--TRANSFER_CONTINUE_OVERVIEW--}</a>");
                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
                                loadTemplate('admin_settings_saved', false, "<div class=\"member_note\">{--TRANSFER_INVALID_CODE--}</div>");
@@ -461,7 +461,7 @@ KEY (`party_userid`)
                $total = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
                $content['in_link'] = $total;
                if ($total > 0) {
-                       $content['in_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$total."</a>";
+                       $content['in_link'] = "<a href=\"{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}\">" . $total . "</a>";
                } // END - if
 
                // Check outgoing transfers
@@ -472,13 +472,13 @@ KEY (`party_userid`)
 
                $content['out_link'] = $dmy;
                if ($dmy > 0) {
-                       $content['out_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=list_out\">".$dmy."</a>";
+                       $content['out_link'] = "<a href=\"{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}\">" . $dmy . "</a>";
                } // END - if
 
                // Total transactions
                $content['all_link'] = $total;
                if ($total > 0) {
-                       $content['all_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=list_all\">".$total."</a>";
+                       $content['all_link'] = "<a href=\"{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}\">" . $total . "</a>";
                } // END - if
 
                if (isFormSent()) {
@@ -504,7 +504,7 @@ KEY (`party_userid`)
                // Set 'new transfer' link according to above option
                switch (getUserData('opt_in')) {
                        case 'Y':
-                               $content['new_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=new\">{--TRANSFER_NOW_LINK--}</a>";
+                               $content['new_link'] = "<a href=\"{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}\">{--TRANSFER_NOW_LINK--}</a>";
                                break;
 
                        case 'N':
index 44f10ad..1409dcc 100644 (file)
@@ -111,13 +111,13 @@ if ((!isGetRequestElementSet('mode')) || (getRequestElement('mode') == 'choose')
                // Is the payout mode active?
                if (getConfig('wernis_payout_active') == 'Y') {
                        // Add link
-                       $content['payout_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{?URL?}/modules.php?module=login&amp;what=wernis&amp;mode=payout\"><div style=\"padding-top: 10px\">{--MEMBER_WERNIS_MODE_PAYOUT--}</div></a>";
+                       $content['payout_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{%url=modules.php?module=login&amp;what=wernis&amp;mode=payout%}\"><div style=\"padding-top: 10px\">{--MEMBER_WERNIS_MODE_PAYOUT--}</div></a>";
                } // END - if
 
                // Is the withdraw mode active?
                if (getConfig('wernis_withdraw_active') == 'Y') {
                        // Add link
-                       $content['withdraw_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{?URL?}/modules.php?module=login&amp;what=wernis&amp;mode=withdraw\"><div style=\"padding-top: 10px\">{--MEMBER_WERNIS_MODE_WITHDRAW--}</div></a>";
+                       $content['withdraw_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{%url=modules.php?module=login&amp;what=wernis&amp;mode=withdraw%}\"><div style=\"padding-top: 10px\">{--MEMBER_WERNIS_MODE_WITHDRAW--}</div></a>";
                } // END - if
 
                // Mode chooser! ;-)
index 47478a7..6297f28 100644 (file)
@@ -340,7 +340,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
        // Begin the navigation line
        if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
                $GLOBALS['nav_depth'] = '0';
-               $prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{?URL?}/modules.php?module=".getModule().$LINK_ADD."\">Home</a></strong>";
+               $prefix = "<div class=\"you_are_here\">{--YOU_ARE_HERE--}&nbsp;<strong><a class=\"you_are_here\" href=\"{%url=modules.php?module=" . getModule() . $LINK_ADD . "%}\">Home</a></strong>";
        } else {
                if ($return === false) $GLOBALS['nav_depth']++;
                $prefix = '';
@@ -356,7 +356,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 
        if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
                // Output HTML code
-               $OUT = $prefix . "<strong><a class=\"you_are_here\" href=\"{?URL?}/modules.php?module=" . $modCheck . '&amp;' . $type . '=' . $search . $LINK_ADD . "\">" . getTitleFromMenu($accessLevel, $search, $type, $ADD) . "</a></strong>\n";
+               $OUT = $prefix . "<strong><a class=\"you_are_here\" href=\"{%url=modules.php?module=" . $modCheck . '&amp;' . $type . '=' . $search . $LINK_ADD . "%}\">" . getTitleFromMenu($accessLevel, $search, $type, $ADD) . "</a></strong>\n";
 
                // Can we close the you-are-here navigation?
                //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*<br />");
@@ -447,7 +447,7 @@ function addMenu ($mode, $action, $what) {
                                                } // END - if
 
                                                // Navigation link
-                                               $OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{?URL?}/modules.php?module=".getModule()."&amp;what=".$content['sub_what']."\" target=\"_self\">";
+                                               $OUT .= "<a name=\"menu\" class=\"menu_blur\" href=\"{%url=modules.php?module=" . getModule() . '&amp;what=' . $content['sub_what'] . "%}\" target=\"_self\">";
                                        } else {
                                                // Not found! - open
                                                $OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_WHAT_404--}\">";
@@ -1246,7 +1246,8 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                // Load email template
                                $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
-                               sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message);
+                               // Send email
+                               sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
                        } elseif (($sendNotify) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
                                // Prepare content
                                $content = array(
@@ -1258,7 +1259,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                $message = loadEmailTemplate('add-points', $content, $userid);
 
                                // And sent it away
-                               sendEmail(getUserData('email'), getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+                               sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
                                if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
                        }
 
index f26fc26..8d8d5b7 100644 (file)
@@ -53,7 +53,7 @@ if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) {
 // Is a session id there?
 if (session_id() == '') {
        // Start the session
-       session_start();
+       $GLOBALS['valid_session'] = session_start();
 } // END - if
 
 // Load language file(s)
index d8e1514..47c6b65 100644 (file)
@@ -69,7 +69,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
                        switch (getConfig('css_php')) {
                                case 'DIRECT': // Just link them (unsupported)
-                                       outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/theme/' . getCurrentTheme() . '/' . $value . '" />');
+                                       outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
                                        break;
 
                                case 'FILE': // Output contents
@@ -106,7 +106,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        loadTemplate('css_inline', false, $OUT);
 } else {
        // Now we load all CSS files from css.php!
-       outputHtml('<link rel="stylesheet" type="text/css" href="{?URL?}/css.php', false);
+       outputHtml('<link rel="stylesheet" type="text/css" href="{%url=css.php', false);
        if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
@@ -119,7 +119,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        }
 
        // Close tag
-       outputHtml('" />');
+       outputHtml('%}" />');
 }
 
 // [EOF]
index 1ecde45..7e28564 100644 (file)
@@ -222,12 +222,12 @@ function detectRemoteHostname () {
 }
 
 // "Getter" for user agent
-function detectUserAgent () {
+function detectUserAgent ($alwaysReal = false) {
        // Get remote ip from environment
        $userAgent = getenv('HTTP_USER_AGENT');
 
        // Is removeip installed?
-       if (isExtensionActive('removeip')) {
+       if ((isExtensionActive('removeip')) && ($alwaysReal === false)) {
                // Then anonymize it
                $userAgent = getAnonymousUserAgent($userAgent);
        } // END - if
index f08e799..4c859b6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -46,7 +46,7 @@ $GLOBALS['startTime'] = microtime(true);
 // Set module
 $GLOBALS['module'] = 'index';
 
-// Set 'CSS-Mode'
+// Set CSS mode
 $GLOBALS['output_mode'] = '0';
 
 // Load config.php
index 04bbdb1..39c4c7b 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_bank_package" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_bank_package%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" height="30" colspan="3" align="center">
index 2575924..f540b91 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=refbanner" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=refbanner%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="410">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center" height="30">
index 0f8be66..2a74cf0 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" align="center" colspan="3">
index b22c77e..c6b0c1c 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_country" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_country%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="430">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
index 1f2ad88..a8c6104 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_email" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_email%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="500"
        align="center" class="admin_table dashed">
        <tr>
index 863ee4c..fc3eeb1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_networks&amp;do=addnetwork" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_networks&amp;do=addnetwork%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center" height="30">
index 1f0acef..92d187c 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=payments&amp;do=add" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="410">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center" height="30">
index 3b423dd..1dca5b5 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_points&amp;userid=$content[userid]" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_points&amp;userid=$content[userid]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title seperator" height="10" colspan="3">&nbsp;</td>
index a27b66f..f8d9862 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_points&amp;userid=all" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_points&amp;userid=all%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="500"
        align="center" class="admin_table dashed">
        <tr>
index 47a2ae9..597e669 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_rallye%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="500"
        class="admin_table dashed">
        <tr>
index 984e22e..7b8f6a6 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=$content" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="480"
        class="admin_table dashed">
        <tr>
index c42555a..2b8703e 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=add" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref&amp;do=add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
index 045844a..84c32cc 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_sponsor" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="530">
 <tr>
   <td class="admin_title bottom" width="10" height="30">&nbsp;</td>
index 541faac..14b9ed8 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=add_sponsor&amp;force=1" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_sponsor&amp;force=1%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td class="admin_title bottom" align="center">
index 894b9e1..281694b 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_sponsor_pay" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_sponsor_pay%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
   <td class="admin_title bottom" colspan="3" align="center" height="30">
index 89b3913..af24387 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=add_surfbar_url%}" method="post">
 <div class="admin_table dashed">
        <div class="admin_title bottom">
                <strong>URL in Surfbar hinzuf&uuml;gen:</strong>
index 944a72d..e5e282b 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admin_add" method="post" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admin_add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td height="8" colspan="5"></td>
index 6047e73..9795cbc 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admins_add" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index a5e8a89..81c817a 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_admins" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 94348ee..c510d51 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admins_contct&amp;admin=$content[admin]" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_contct&amp;admin=$content[admin]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <!-- @TODO Shouldn't we add a title here? //-->
        <tr>
index b761241..4051820 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_mails%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title" height="30">
index aa57021..51f8037 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admins_mails" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_mails%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title" height="30">
index f31eb4a..f3e4dd1 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="2" class="admin_title" height="40">
index 7e57dec..31d2593 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <!-- @TODO Shouldn't we add a title here? //-->
 <tr>
index c3cd0c4..552bd82 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="2" class="admin_title" height="40">
index 1980bb6..fedf236 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_active%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
index e80d8c4..587f584 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_admin%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 10594f7..293622c 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_admins" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index 46c8760..d25a5ed 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_admins" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index 30f4617..d371a92 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_admins" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index f5e16b0..ca281d1 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_autopurge%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index e302daa..af693d6 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_beg" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_beg%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index e7345e9..363357e 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_birthday%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index ccb52ca..e4959ad 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_bonus" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_bonus%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index be06331..4fa5935 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="4" class="admin_title bottom" height="50">
index d4052a6..408648e 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_doubler" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_doubler%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 372b563..705c33d 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_email" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_email%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="3" class="admin_title" height="30">
index 98ca746..ae79ebc 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_email&amp;do=del" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_email&amp;do=del%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0"
        class="admin_table dashed" width="500">
        <tr>
index 0c3232b..67e9852 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_email&amp;do=edit" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_email&amp;do=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td align="center" colspan="2" height="30" class="bottom"><strong>{--EDIT_MRECEIVE--}:</strong></td>
index 8a2a4d4..4d59936 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_extensions" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_extensions%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index 5188de5..f982877 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_holiday%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index e935840..8e2fcc6 100644 (file)
@@ -5,12 +5,12 @@
        </tr>
        <tr>
                <td class="guest_menu_row"><a class="menu_blur"
-                       href="{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=target">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</a>
+                       href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_TARGET--}</a>
                </td>
        </tr>
        <tr>
                <td class="guest_menu_bottom"><a class="menu_blur"
-                       href="{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=settings">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</a>
+                       href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">&nbsp;<strong><big>&middot;</big></strong>&nbsp;{--ADMIN_EDIT_HOME_SETTINGS--}</a>
                </td>
        </tr>
 </table>
index 75e5597..5271b4c 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_home&amp;sub=settings" method="post">
+<form accept-charset="utf-8" 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 bottom" height="30">
index ea15e4a..94978f5 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_mediadata%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center">
index ce939de..656af47 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_menu" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_menu%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index 4774364..6d62c36 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_newsletter" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_newsletter%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center">
index 16a33d5..d937177 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_nickname%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 305ec46..99a44d3 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_order" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_order%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" align="center">
index 9d989f8..bc6586e 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_order" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_order%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom seperator" height="30" width="10">&nbsp;</td>
index 53946b4..fc37d0a 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_other" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_other%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom">
index b01d6bc..8a70610 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index 2d5e3cb..1e99994 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_payouts&amp;ok=ok" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_payouts&amp;ok=ok%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title bottom" height="30">
index 26c8887..4a3bcbb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_payouts&amp;ok=ok" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_payouts&amp;ok=ok%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index e3760a8..20072df 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=settings" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index da3e3da..2fbf6c5 100644 (file)
@@ -1,27 +1,19 @@
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
-               <td class="seperator" colspan="3" height="7">&nbsp;</td>
-       </tr>
-       <tr>
-               <td class="seperator" width="10" rowspan="3">&nbsp;</td>
                <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=points">{--ADMIN_EDIT_POINTS--}</a>
+                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=points%}">{--ADMIN_EDIT_POINTS--}</a>
                </td>
-               <td class="seperator" width="10" rowspan="3">&nbsp;</td>
        </tr>
        <tr>
                <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=ref">{--ADMIN_EDIT_REFDEPTHS--}</a>
+                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=ref%}">{--ADMIN_EDIT_REFDEPTHS--}</a>
                </td>
        </tr>
        <tr>
                <td><strong><big>&middot;</big></strong>&nbsp;&nbsp;<a
-                       href="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=settings">{--ADMIN_EDIT_POINT_SETTINGS--}</a>
+                       href="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=settings%}">{--ADMIN_EDIT_POINT_SETTINGS--}</a>
                </td>
        </tr>
-       <tr>
-               <td class="seperator" colspan="3" height="7">&nbsp;</td>
-       </tr>
 </table>
 </div>
index e69fc79..48e3c95 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_primera" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_primera%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index de3e3d0..1df1347 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_proxy" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_proxy%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index 9098f53..1ef0afd 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=$content[rallye]" method="post" style="margin-bottom: 10px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[rallye]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title" height="30">
index d683a3c..62c6e40 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=$content[rallye]" method="post" style="margin-bottom: 10px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[rallye]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title" height="30">
index 4ce3e4a..07d93b1 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=$content[rallye]" method="post" style="margin-bottom: 10px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=$content[rallye]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title" height="30">
index acfaab4..ab2bb46 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_refback" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_refback%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index 0427e43..25f383b 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_refid" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_refid%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
index 60986ef..134561e 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_register%}" method="post">
 <table border="0" cellpadding="0" cellspacing="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title" height="30"><strong>{--REGISTER_MUST_HEADER--}:</strong>
index 282302f..0bb9a5b 100644 (file)
@@ -1,84 +1,41 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_register2" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_register2%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="430">
        <tr>
-               <td class="admin_title bottom seperator" height="30" width="10">&nbsp;</td>
-               <td class="admin_title bottom" colspan="3" align="center">
+               <td class="admin_title bottom" colspan="2" align="center">
                        <strong>{--EDIT_REGFORM_SETTINGS--}</strong>
                </td>
-               <td class="admin_title bottom seperator" width="10">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="right" width="250">{--LEAST_CATS--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="center" width="150">
                        <input type="text" name="least_cats" class="admin_normal" size="6" maxlength="6" value="{?least_cats?}" />
                </td>
-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="right" width="250">{--ADMIN_CFG_REGISTER_DEFAULT--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="center" width="150">$content[register_default]</td>
-               <td width="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="right">{--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="center">$content[display_refid]</td>
-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="right">{--IP_TIMEOUT--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="center">$content[ip_timeout]</td>
-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="right" width="280">{--REJECT_DOUBLE_EMAIL--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
                <td align="center">$content[check_double_email]</td>
-               <td width="10" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td colspan="5" height="7" class="seperator">&nbsp;</td>
-       </tr>
-       <tr>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td align="right" width="280">{--REJECT_DOUBLE_PASS--}:</td>
-               <td width="10" class="seperator">&nbsp;</td>
-               <td align="center">$content[check_double_pass]</td>
-               <td width="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="5" height="7" class="seperator bottom">&nbsp;</td>
+               <td class="bottom" align="right" width="280">{--REJECT_DOUBLE_PASS--}:</td>
+               <td class="bottom" align="center">$content[check_double_pass]</td>
        </tr>
        <tr>
-               <td width="10" class="admin_footer seperator">&nbsp;</td>
-               <td class="admin_footer" colspan="3" align="center">
+               <td class="admin_footer" colspan="2" align="center">
                        <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
                </td>
-               <td width="10" class="admin_footer seperator">&nbsp;</td>
        </tr>
 </table>
 </form>
index 88b21d6..375d25e 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_removeip" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_removeip%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
 <tr>
        <td colspan="2" align="center" class="admin_title bottom" height="30">
index dc5fb07..5f5aeaa 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_rewrite%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom right" align="center" height="30">
index ee69e69..93a6f0d 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_secure%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center">
index 76f77d6..2beb1d0 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_proxy" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_proxy%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="700">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index f2bc826..12c01f9 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_sponsor" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_sponsor%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
 <tr>
   <td colspan="2" align="center" class="admin_title bottom" height="30">
index ae00400..923a196 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_stats" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_stats%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 4b90e75..7cb0532 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_points&amp;sub=points" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_points&amp;sub=points%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="3" align="center">
index 71a47dc..d33ba0a 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_surfbar" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_surfbar%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="2" align="center" class="admin_title bottom" height="30">
index e5663bf..3a53437 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_title%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index dbdcd92..bc861b3 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_top10%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 763fdeb..7b3d38c 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_transfer%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index ff9087d..9634cd6 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_user%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 259da8a..493352e 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_wernis%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 67ae166..61787d9 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_yoomedia" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_yoomedia%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
 <tr>
        <td colspan="2" align="center" class="admin_title bottom" height="30">
index 00df3e2..a3d4ee8 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=user_contct&amp;userid=$content[userid]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=user_contct&amp;userid=$content[userid]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td align="center" class="admin_title bottom" height="30">
index 8ef9522..59c768d 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admins_edit" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index cf30d54..42fe8cb 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 accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_bank_package%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="5" align="center" class="admin_title" height="30">
index af40250..ef5efa2 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_cats&amp;do=del" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats&amp;do=del%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td align="center" height="30" class="admin_title bottom">
index d9f2427..777d101 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_networks&amp;do=removenetwork" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_networks&amp;do=removenetwork%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="4">
index 09bdcde..4fc6734 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=payments&amp;do=del" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=del%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td align="center" height="30" class="admin_title bottom">
index ef23e1f..78c4484 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=del_sponsor&amp;id=$content[userid]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=del_sponsor&amp;id=$content[userid]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td align="center" class="admin_title bottom" height="28">
index 7d5a847..54f25d6 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_surfbar_urls" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td align="center" colspan="3" class="admin_title" height="30">
index ee2a63f..baee1f1 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=del_user&amp;userid=$content[userid]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=del_user&amp;userid=$content[userid]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="28"><strong
index ff74e95..6b009c8 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=admins_edit" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admins_edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="6" align="center" class="admin_title bottom" height="30">
index 5ca01ed..2fa44d3 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_bank_package" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_bank_package%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <tr>
        <td colspan="4" align="center" class="admin_title bottom" height="30">
index 307f4e6..15d8a29 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=config_cats&amp;do=edit" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_cats&amp;do=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td align="center" colspan="3" height="30" class="admin_title bottom">
index 466de2d..d5ae214 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_emails" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="3" class="admin_title">
index 0de48bd..b4a3e19 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_emails" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_emails%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="3" class="admin_title">
index b11db61..185c1c1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_networks&amp;do=changenetwork" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_networks&amp;do=changenetwork%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="4">
index 94a5dd4..bd4cde7 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=payments&amp;do=edit" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=payments&amp;do=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="500">
        <tr>
                <td align="center" colspan="2" class="admin_title bottom" height="30"><strong>{--EDIT_PAYMENT--}:</strong></td>
index 9822413..1ed8ab4 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_rallyes" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_rallyes%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 93328c9..a765298 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id=$content[id]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id=$content[id]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr><td class="admin_title seperator" height="10" colspan="3">&nbsp;</td></tr>
 <tr>
index b89f785..b7180e9 100644 (file)
@@ -1,4 +1,4 @@
-<div align="center"><form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=edit" method="post">
+<div align="center"><form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=edit%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
 <tr>
   <td colspan="5" align="center" class="admin_title bottom" height="30">
index 7ba9d30..1a8ca37 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id=$content[id]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id=$content[id]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr><td class="admin_title seperator" height="10" colspan="3">&nbsp;</td></tr>
 <tr>
index bfb04b1..ddd63cb 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=list_surfbar_urls" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=list_surfbar_urls%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td align="center" colspan="2" class="admin_title" height="30">
index 397e63a..73de5cd 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=edit_user&amp;userid=$content[userid]" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=edit_user&amp;userid=$content[userid]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" align="center">
        <tr>
                <td colspan="3" align="center" class="admin_title bottom" height="30">
index 3713c6d..1cb626c 100644 (file)
@@ -76,6 +76,6 @@
 </tr>
 <tr>
        <td align="center" class="switch_sw$content[sw] top admin_del_link" colspan="3">
-               <a href="{?URL?}/modules.php?module=admin&amp;what=del_email&amp;mid=$content[mid]">{--ADMIN_DELETE_NORMAL_MAIL--}</a>
+               <a href="{%url=modules.php?module=admin&amp;what=del_email&amp;mid=$content[mid]%}">{--ADMIN_DELETE_NORMAL_MAIL--}</a>
        </td>
 </tr>
index e0e8615..44d772e 100644 (file)
@@ -1,4 +1,4 @@
 <a name="ext_$content[ext_name]"></a>
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]" method="post" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]%}" method="post">
        <input type="submit" name="ok" class="admin_submit" value="{--ADMIN_REGISTER_EXTENSION--}" />
 </form>
index 9b2fe76..aa804b0 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom" height="30">
index 520745e..1fc7366 100644 (file)
@@ -1,4 +1,4 @@
-<form accept-charset="utf-8" action="{?URL?}/modules.php?module=admin&amp;what=extensions" method="post">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title" height="30">
index 51f0ce1..081a5d0 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" style="margin-bottom: 0px">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=extensions%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="4" align="center" class="admin_title" height="30">
index 63f9604..443aea2 100644 (file)
@@ -1,7 +1,7 @@
 <div align="center">
        <div class="admin_table dashed" style="width:400px;margin-bottom:5px">
        <ul style="padding:0px;margin:0px">
-               <li class="menu_blur bottom"><a href="{?URL?}/modules.php?module=index" title="{--ADMIN_BACK_TO_GUEST_MENU--}">{--ADMIN_BACK_TO_GUEST_MENU--}</a></li>
+               <li class="menu_blur bottom"><a href="{%url=modules.php?module=index%}" title="{--ADMIN_BACK_TO_GUEST_MENU--}">{--ADMIN_BACK_TO_GUEST_MENU--}</a></li>
                <li class="menu_blur bottom"><a href="http://forum.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_FORUM_LINK--}">{--ADMIN_SUPPORT_FORUM_LINK--}</a></li>
                <li class="menu_blur"><a href="http://bugs.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_BUGTRACKER_LINK--}">{--ADMIN_SUPPORT_BUGTRACKER_LINK--}</a></li>
        </ul>
index f5abc01..b788ae9 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="2" class="admin_title" height="40">
index 276b90d..62f8732 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td class="header_column bottom right" align="center" width="30" height="30"><strong>{--ID_SELECT--}</strong></td>
index 32c7f90..cbfe83f 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" colspan="2" class="admin_title" height="40">
index 7ef6836..4bc812e 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" target="_self">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=$content[sub]%}"&nbs