Extension ext-earning introduced (unfinished), renamings:
authorRoland Häder <roland@mxchange.org>
Wed, 3 Aug 2011 04:51:02 +0000 (04:51 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 3 Aug 2011 04:51:02 +0000 (04:51 +0000)
- Extension ext-earning introduced (ext-sql_patches did hold the tables)
- Some messages updated ('Mitglied-Id' reads better)
- All fooRequestParameterBar() functions renamed to fooRequestElementBar()
- TODOs.txt updated

306 files changed:
.gitattributes
DOCS/TODOs.txt
beg.php
birthday_confirm.php
click.php
confirm.php
debug.php
doubler.php
img.php
inc/callback-functions.php
inc/expression-functions.php
inc/extensions/ext-beg.php
inc/extensions/ext-bonus.php
inc/extensions/ext-doubler.php
inc/extensions/ext-earning.php [new file with mode: 0644]
inc/extensions/ext-forced.php
inc/extensions/ext-nickname.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-task.php
inc/filter/bonus_filter.php
inc/filter/forced_filter.php
inc/filter/other_filter.php
inc/filter/politician_stop_filter.php
inc/filter/theme_filter.php
inc/filter/uberwach_filter.php
inc/filters.php
inc/functions.php
inc/header.php
inc/install-functions.php
inc/install-inc.php
inc/js/js-surfbar_frame_top.php
inc/js/js-surfbar_member_edit.php
inc/language-functions.php
inc/language/admins_de.php
inc/language/beg_de.php
inc/language/bonus_de.php
inc/language/de.php
inc/language/earning_de.php [new file with mode: 0644]
inc/language/forced_de.php
inc/language/holiday_de.php
inc/language/install_de.php
inc/language/nickname_de.php
inc/language/refback_de.php
inc/language/sponsor_de.php
inc/language/yoomedia_de.php
inc/libs/earning_functions.php [new file with mode: 0644]
inc/libs/network_functions.php
inc/libs/newsletter_functions.php
inc/libs/primera_functions.php
inc/libs/register_functions.php
inc/libs/sponsor_functions.php
inc/libs/surfbar_functions.php
inc/libs/theme_functions.php
inc/libs/user_functions.php
inc/load_config.php
inc/loader/load-earning.php
inc/mails/doubler_mails.php
inc/modules/admin.php
inc/modules/admin/action-logout.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-add_rallye.php
inc/modules/admin/what-add_surfbar_url.php
inc/modules/admin/what-admin_add.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-admins_add.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-admins_edit.php
inc/modules/admin/what-admins_mails.php
inc/modules/admin/what-config_beg.php
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_cats.php
inc/modules/admin/what-config_home.php
inc/modules/admin/what-config_mediadata.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_other.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-config_primera.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_register.php
inc/modules/admin/what-config_register2.php
inc/modules/admin/what-config_rewrite.php
inc/modules/admin/what-config_secure.php
inc/modules/admin/what-config_session.php
inc/modules/admin/what-config_wernis.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-del_transfer.php
inc/modules/admin/what-del_user.php
inc/modules/admin/what-edit_emails.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-edit_user.php
inc/modules/admin/what-email_archiv.php
inc/modules/admin/what-email_details.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-guest_add.php
inc/modules/admin/what-guestedit.php
inc/modules/admin/what-list_admins_acls.php
inc/modules/admin/what-list_bank_package.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_country.php
inc/modules/admin/what-list_coupon.php
inc/modules/admin/what-list_doubler.php
inc/modules/admin/what-list_email_max_rec.php
inc/modules/admin/what-list_forced_ads.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_network_api_translation.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_network_types.php
inc/modules/admin/what-list_nickname.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_refs.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_sponsor_pay.php
inc/modules/admin/what-list_sponsor_pays.php
inc/modules/admin/what-list_surfbar_urls.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_yoomedia_tm.php
inc/modules/admin/what-lock_sponsor.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-logs.php
inc/modules/admin/what-mem_add.php
inc/modules/admin/what-memedit.php
inc/modules/admin/what-overview.php
inc/modules/admin/what-payments.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-send_bonus.php
inc/modules/admin/what-send_coupon.php
inc/modules/admin/what-send_newsletter.php
inc/modules/admin/what-stats_mods.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-surfbar_stats.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-theme_import.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-unlock_surfbar_urls.php
inc/modules/admin/what-usage.php
inc/modules/admin/what-user_contct.php
inc/modules/frametester.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-login.php
inc/modules/guest/what-register.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-stats.php
inc/modules/loader.php
inc/modules/member/what-book_surfbar.php
inc/modules/member/what-cash_coupon.php
inc/modules/member/what-categories.php
inc/modules/member/what-earnings.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-list_surfbar.php
inc/modules/member/what-mydata.php
inc/modules/member/what-nickname.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-primera.php
inc/modules/member/what-refback.php
inc/modules/member/what-support.php
inc/modules/member/what-themes.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
inc/modules/member/what-wernis.php
inc/modules/order.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/mysql-manager.php
inc/referal-functions.php
inc/request-functions.php
inc/revision-functions.php
inc/stylesheet.php
inc/template-functions.php
inc/wrapper-functions.php
install.php
js.php
mailid.php
mailid_top.php
show_bonus.php
sponsor_confirm.php
surfbar.php
templates/de/emails/admin/admin_coupon_cashed.tpl
templates/de/emails/admin/admin_delete_surfbar_urls.tpl
templates/de/emails/admin/admin_earning_added.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_earning_updated.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_edit_surfbar_urls.tpl
templates/de/emails/admin/admin_holiday_deactivated.tpl
templates/de/emails/admin/admin_holiday_request.tpl
templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl
templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl
templates/de/emails/admin/admin_newsletter_reset.tpl
templates/de/emails/admin/admin_payout_request.tpl
templates/de/emails/admin/admin_payout_request_banner.tpl
templates/de/emails/admin/admin_support-ordr.tpl
templates/de/emails/admin/admin_support-reflink.tpl
templates/de/emails/admin/admin_support-unconfirmed.tpl
templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_active_depleted.tpl
templates/de/emails/admin/admin_surfbar_url_active_pending.tpl
templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl
templates/de/emails/admin/admin_surfbar_url_confirmed.tpl
templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
templates/de/emails/admin/admin_surfbar_url_migrate.tpl
templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl
templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl
templates/de/emails/admin/admin_surfbar_url_pending.tpl
templates/de/emails/admin/admin_surfbar_url_pending_active.tpl
templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl
templates/de/emails/admin/admin_surfbar_url_reg.tpl
templates/de/emails/admin/admin_surfbar_url_rejected.tpl
templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl
templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl
templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl
templates/de/emails/admin/admin_transfer_points.tpl
templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl
templates/de/emails/admin/admin_wernis_request.tpl
templates/de/emails/member/member_bonus_pool_normal.tpl
templates/de/emails/member/member_delete_links.tpl
templates/de/emails/member/member_delete_surfbar_urls.tpl
templates/de/emails/member/member_earning_added.tpl [new file with mode: 0644]
templates/de/emails/member/member_earning_updated.tpl [new file with mode: 0644]
templates/de/emails/member/member_edit_surfbar_urls.tpl
templates/de/emails/member/member_holiday_activated.tpl
templates/de/emails/member/member_holiday_removed.tpl
templates/de/emails/member/member_holiday_request.tpl
templates/de/emails/member/member_holiday_unlock.tpl
templates/de/emails/member/member_lock_active_surfbar_urls.tpl
templates/de/emails/member/member_lock_locked_surfbar_urls.tpl
templates/de/emails/member/member_profile.tpl
templates/de/emails/member/member_refback.tpl
templates/de/emails/member/member_support-ordr.tpl
templates/de/emails/member/member_support-reflink.tpl
templates/de/emails/member/member_support-unconfirmed.tpl
templates/de/emails/member/member_surfbar_low_points.tpl
templates/de/emails/member/member_surfbar_url_active_deleted.tpl
templates/de/emails/member/member_surfbar_url_active_pending.tpl
templates/de/emails/member/member_surfbar_url_active_stopped.tpl
templates/de/emails/member/member_surfbar_url_confirmed.tpl
templates/de/emails/member/member_surfbar_url_depleted.tpl
templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
templates/de/emails/member/member_surfbar_url_locked_pending.tpl
templates/de/emails/member/member_surfbar_url_migrate.tpl
templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl
templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl
templates/de/emails/member/member_surfbar_url_migrated_pending.tpl
templates/de/emails/member/member_surfbar_url_pending.tpl
templates/de/emails/member/member_surfbar_url_pending_active.tpl
templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
templates/de/emails/member/member_surfbar_url_pending_rejected.tpl
templates/de/emails/member/member_surfbar_url_reg.tpl
templates/de/emails/member/member_surfbar_url_rejected.tpl
templates/de/emails/member/member_surfbar_url_stopped_continued.tpl
templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
templates/de/emails/member/member_surfbar_url_stopped_pending.tpl
templates/de/emails/member/member_surfbar_url_unlock.tpl
templates/de/emails/member/member_transfer_recipient.tpl
templates/de/emails/member/member_transfer_sender.tpl
templates/de/emails/member/member_undelete_active_surfbar_urls.tpl
templates/de/emails/member/member_user_deleted.tpl
templates/de/emails/member/member_user_locked.tpl
templates/de/emails/member/member_user_pool_normal.tpl
templates/de/emails/member/member_user_unlocked.tpl
templates/de/emails/newsletter.tpl
templates/de/emails/newsletter_html.tpl
templates/de/html/admin/admin_add_admins.tpl
templates/de/html/admin/admin_edit_user.tpl
templates/de/html/admin/admin_list_network_params_row.tpl
templates/de/html/admin/admin_list_user.tpl
templates/de/html/admin/admin_reg_form.tpl
templates/de/html/admin/admin_reset_password_form.tpl
templates/de/html/ext/ext_earning.tpl [new file with mode: 0644]
templates/de/html/guest/guest_extensions.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/install/install_page2.tpl
templates/de/html/install/install_page3.tpl
templates/de/html/member/member_book_surfbar_dynamic.tpl
templates/de/html/member/member_book_surfbar_static.tpl
templates/de/html/member/member_doubler_list.tpl
templates/de/html/member/member_earning.tpl [new file with mode: 0644]
templates/de/html/member/member_earning_data_invalid.tpl [new file with mode: 0644]
templates/de/html/member/member_earning_data_popup.tpl [new file with mode: 0644]
templates/de/html/member/member_earning_popup_form_row.tpl [new file with mode: 0644]
templates/de/html/member/member_earning_popup_row.tpl [new file with mode: 0644]
templates/de/html/member/member_start_surfbar_dynamic.tpl
templates/de/html/member/member_start_surfbar_static.tpl
templates/de/html/member/member_surfbar_delete_action_form.tpl
templates/de/html/member/member_surfbar_edit_action_form.tpl
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css
theme/org/css/general.css
theme/schleuder/css/general.css
theme/ship-simu/css/general.css
view.php

index 1e4ed11..f465bb5 100644 (file)
@@ -144,6 +144,7 @@ inc/extensions/ext-coupon.php svneol=native#text/plain
 inc/extensions/ext-debug.php svneol=native#text/plain
 inc/extensions/ext-demo.php svneol=native#text/plain
 inc/extensions/ext-doubler.php svneol=native#text/plain
+inc/extensions/ext-earning.php svneol=native#text/plain
 inc/extensions/ext-events.php svneol=native#text/plain
 inc/extensions/ext-forced.php svneol=native#text/plain
 inc/extensions/ext-funcoins.php svneol=native#text/plain
@@ -273,6 +274,7 @@ inc/language/coupon_de.php svneol=native#text/plain
 inc/language/de.php svneol=native#text/plain
 inc/language/debug_de.php svneol=native#text/plain
 inc/language/doubler_de.php svneol=native#text/plain
+inc/language/earning_de.php svneol=native#text/plain
 inc/language/en.php svneol=native#text/plain
 inc/language/forced_de.php svneol=native#text/plain
 inc/language/funcoins_de.php svneol=native#text/plain
@@ -330,6 +332,7 @@ inc/libs/country_functions.php svneol=native#text/plain
 inc/libs/coupon_functions.php svneol=native#text/plain
 inc/libs/debug_functions.php svneol=native#text/plain
 inc/libs/doubler_functions.php svneol=native#text/plain
+inc/libs/earning_functions.php svneol=native#text/plain
 inc/libs/events_functions.php svneol=native#text/plain
 inc/libs/forced_functions.php svneol=native#text/plain
 inc/libs/funcoins_functions.php svneol=native#text/plain
@@ -817,6 +820,8 @@ templates/de/emails/admin/admin_coupon_purge.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_coupon_purge_row.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_delete_surfbar_urls.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_earning_added.tpl svneol=native#text/plain
+templates/de/emails/admin/admin_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain
 templates/de/emails/admin/admin_holiday_deactivated.tpl svneol=native#text/plain
@@ -923,6 +928,8 @@ templates/de/emails/member/member_del_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_links.tpl svneol=native#text/plain
 templates/de/emails/member/member_delete_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_doubler.tpl svneol=native#text/plain
+templates/de/emails/member/member_earning_added.tpl svneol=native#text/plain
+templates/de/emails/member/member_earning_updated.tpl svneol=native#text/plain
 templates/de/emails/member/member_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_activated.tpl svneol=native#text/plain
 templates/de/emails/member/member_holiday_removed.tpl svneol=native#text/plain
@@ -1513,6 +1520,7 @@ templates/de/html/ext/ext_coupon.tpl svneol=native#text/plain
 templates/de/html/ext/ext_debug.tpl svneol=native#text/plain
 templates/de/html/ext/ext_demo.tpl svneol=native#text/plain
 templates/de/html/ext/ext_doubler.tpl svneol=native#text/plain
+templates/de/html/ext/ext_earning.tpl svneol=native#text/plain
 templates/de/html/ext/ext_events.tpl svneol=native#text/plain
 templates/de/html/ext/ext_forced.tpl svneol=native#text/plain
 templates/de/html/ext/ext_funcoins.tpl svneol=native#text/plain
@@ -1699,6 +1707,11 @@ templates/de/html/member/member_content_right.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list.tpl svneol=native#text/plain
 templates/de/html/member/member_doubler_list_rows.tpl svneol=native#text/plain
+templates/de/html/member/member_earning.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_data_invalid.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_data_popup.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_popup_form_row.tpl svneol=native#text/plain
+templates/de/html/member/member_earning_popup_row.tpl svneol=native#text/plain
 templates/de/html/member/member_edit_refback.tpl svneol=native#text/plain
 templates/de/html/member/member_footer.tpl svneol=native#text/plain
 templates/de/html/member/member_goto_top.tpl svneol=native#text/plain
index 9ed35e0..4af4c41 100644 (file)
@@ -3,7 +3,7 @@
 ./autoreg.php:58:// @TODO Add processing of request here
 ./beg.php:175:                 // @TODO Opps, what is missing here???
 ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:504:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:510:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:136:        // @TODO Make this all better... :-/
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:96:                     // @TODO 4 is hard-coded here, should we move it out in config?
@@ -53,7 +53,7 @@
 ./inc/functions.php:2041:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:2233:      // @TODO Rename column data_type to e.g. mail_status
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
-./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
 ./inc/language/de.php:1071:    // @TODO Rewrite these two constants
 ./inc/language/de.php:1087:    // @TODO Rewrite these three constants
 ./inc/language/de.php:757:// @TODO Are these constants longer used?
@@ -72,7 +72,7 @@
 ./inc/libs/rallye_functions.php:770:   $EXPIRE = 3; // @TODO The hard-coded value...
 ./inc/libs/rallye_functions.php:856:// @TODO Please document this function
 ./inc/libs/rallye_functions.php:912:           // Load count @TODO Can't we rewrite this to our API?
-./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter
+./inc/libs/register_functions.php:286: // @TODO Rewrite these all to a single filter
 ./inc/libs/sponsor_functions.php:159:                                  // @TODO Rewrite this to API function
 ./inc/libs/sponsor_functions.php:430:                  // @TODO Rewrite this to API function
 ./inc/libs/surfbar_functions.php:1624:         // @TODO This can be somehow rewritten
 ./inc/modules/admin/overview-inc.php:426:                      // @TODO Try to move this in includes
 ./inc/modules/admin/overview-inc.php:43:// @TODO This function does also check for uncompleted tasks
 ./inc/modules/admin/what-add_guestnl_cat.php:47:       // @TODO Check if category does already exist
-./inc/modules/admin/what-add_surfbar_url.php:55:       // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestParameter() calls to $postData
+./inc/modules/admin/what-add_surfbar_url.php:55:       // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestElement() calls to $postData
 ./inc/modules/admin/what-admin_add.php:118:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-admin_add.php:59:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-admin_add.php:75:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/guest/what-mediadata.php:182:// @TODO Rewrite all these if-blocks to filters
 ./inc/modules/guest/what-mediadata.php:67:     // @TODO Find a better formular than this one
 ./inc/modules/guest/what-rallyes.php:89:       // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $adminId . '%}">' . $login . '</a>';
-./inc/modules/guest/what-sponsor_reg.php:287:                  // @TODO Maybe a default referal id?
+./inc/modules/guest/what-sponsor_reg.php:289:                  // @TODO Maybe a default referal id?
 ./inc/modules/guest/what-stats.php:108:                // @TODO This can be somehow rewritten
 ./inc/modules/guest/what-stats.php:82:// @TODO This can be rewritten in a dynamic include
 ./inc/modules/member/what-beg.php:54:// @TODO Can't this be moved into EL?
diff --git a/beg.php b/beg.php
index f73f1a8..056f654 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -56,7 +56,7 @@ setContentType('text/html');
 redirectOnUninstalledExtension('beg');
 
 // Check for userid
-if (isGetRequestParameterSet('userid')) {
+if (isGetRequestElementSet('userid')) {
        // Init variables
        $points = '0';
 
@@ -64,15 +64,15 @@ if (isGetRequestParameterSet('userid')) {
        $pay = false;
 
        // Validate if it is not a number
-       if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestParameter('userid')))) {
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestElement('userid')))) {
                // Maybe we have found a nickname?
-               fetchUserData(getRequestParameter('userid'), 'nickname');
-       } elseif (isNicknameUsed(getRequestParameter('userid'))) {
+               fetchUserData(getRequestElement('userid'), 'nickname');
+       } elseif (isNicknameUsed(getRequestElement('userid'))) {
                // Nickname entered but nickname is not active
                $errorCode = getCode('EXTENSION_PROBLEM');
        } else {
                // Direct userid
-               fetchUserData(getRequestParameter('userid'));
+               fetchUserData(getRequestElement('userid'));
        }
 
        // Check if locked in so don't pay points
@@ -88,7 +88,7 @@ if (isGetRequestParameterSet('userid')) {
                $points = mt_rand((getBegPoints() * 100000), (getBegPointsMax() * 100000)) / 100000;
 
                // Set nickname / userid for template
-               $content['userid']        = getRequestParameter('userid');
+               $content['userid']        = getRequestElement('userid');
                $content['clicks']        = (getUserData('beg_clicks') + 1);
                $content['header_banner'] = loadTemplate('beg_header_banner', true);
                $content['footer_banner'] = loadTemplate('beg_footer_banner', true);
@@ -190,7 +190,7 @@ if (isGetRequestParameterSet('userid')) {
                $errorCode = generateErrorCodeFromUserStatus();
        } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) {
                // Inalid or locked account, so let's find out
-               if (fetchUserData(getRequestParameter('userid'), 'nickname')) {
+               if (fetchUserData(getRequestElement('userid'), 'nickname')) {
                        // Locked account
                        $errorCode = getCode('ACCOUNT_LOCKED');
                } else {
index 2923ceb..6b03c48 100644 (file)
@@ -55,10 +55,10 @@ setContentType('text/html');
 redirectOnUninstalledExtension('birthday');
 
 // Script is installed so let's check for his confirmation link...
-$userid = bigintval(getRequestParameter('userid'));
+$userid = bigintval(getRequestElement('userid'));
 
 // Only allow numbers here...
-$chk = bigintval(getRequestParameter('check'), false);
+$chk = bigintval(getRequestElement('check'), false);
 
 // Check if link is not clicked so far
 $result = SQL_QUERY_ESC("SELECT
@@ -77,7 +77,7 @@ LIMIT 1",
                $userid,
                $chk
        ), __FILE__, __LINE__);
-//* DEBUG: */ debugOutput("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result) . ')');
+//* DEBUG: */ debugOutput("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestElement('check')).'/'.SQL_NUMROWS($result) . ')');
 
 // Prepare content
 $content = array();
index b706543..fb4b5c1 100644 (file)
--- a/click.php
+++ b/click.php
@@ -49,14 +49,14 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Check required parameters
-if ((isGetRequestParameterSet('user')) && (isGetRequestParameterSet('banner'))) {
+if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
        // Update clicks counter...
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1", array(bigintval(getRequestParameter('banner'))), __FILE__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1", array(bigintval(getRequestElement('banner'))), __FILE__, __LINE__);
 
        // A line has been updated?
-       if ((!SQL_HASZEROAFFECTED()) && (isGetRequestParameterSet('user'))) {
+       if ((!SQL_HASZEROAFFECTED()) && (isGetRequestElementSet('user'))) {
                // Redirect to the user's referal link
-               redirectToUrl('ref.php?refid=' . bigintval(getRequestParameter('user')));
+               redirectToUrl('ref.php?refid=' . bigintval(getRequestElement('user')));
        } // END - if
 } // END - if
 
index b172293..ae7c623 100644 (file)
@@ -52,9 +52,9 @@ setContentType('text/html');
 $url = 'modules.php?module=index&amp;what=confirm';
 
 // Is the hash there?
-if (isGetRequestParameterSet('hash')) {
+if (isGetRequestElementSet('hash')) {
        // We have a hash here. So we simply add it
-       $url .= '&amp;hash=' . getRequestParameter('hash');
+       $url .= '&amp;hash=' . getRequestElement('hash');
 } // END - if
 
 // Load the URL
index 86c3ac0..2a11bf6 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -48,13 +48,13 @@ require('inc/config-global.php');
 // Redirect only to registration page when this script is installed
 if ((isExtensionActive('debug')) && (!ifFatalErrorsDetected())) {
        // Is the request parameter set?
-       if (isPostRequestParameterSet('request')) {
+       if (isPostRequestElementSet('request')) {
                // Handle the request
-               if (DEBUG_HANDLE_REQUEST(postRequestParameter('request'))) {
+               if (DEBUG_HANDLE_REQUEST(postRequestElement('request'))) {
                        // Construct FQFN for the module
                        $inc = sprintf("inc/debug/%s/request_%s.php",
                                getConfig('debug_mode'),
-                               SQL_ESCAPE(postRequestParameter('request'))
+                               SQL_ESCAPE(postRequestElement('request'))
                        );
 
                        // Is the module there? Else we log it!
@@ -63,11 +63,11 @@ if ((isExtensionActive('debug')) && (!ifFatalErrorsDetected())) {
                                loadInclude($inc);
                        } else {
                                // Missing request files may happen while development
-                               DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestParameter('request'));
+                               DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestElement('request'));
                        }
                } else {
                        // Unhandled request detected
-                       DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_unhandled', postRequestParameter('request'));
+                       DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_unhandled', postRequestElement('request'));
                }
        } else {
                // Empty request
index 99ab704..e46983e 100644 (file)
@@ -62,17 +62,17 @@ $content = array(
 // Begin with doubler script...
 if (isFormSent()) {
        // Secure points (so only integer/double values are allowed
-       setPostRequestParameter('points', bigintval(postRequestParameter('points')));
+       setPostRequestElement('points', bigintval(postRequestElement('points')));
 
        // Begin with doubling process
-       if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('password')) && (isPostRequestParameterSet('points'))) {
+       if ((isPostRequestElementSet('userid')) && (isPostRequestElementSet('password')) && (isPostRequestElementSet('points'))) {
                // Probe for nickname extension and if a nickname was entered
-               if (isNicknameUsed(postRequestParameter('userid'))) {
+               if (isNicknameUsed(postRequestElement('userid'))) {
                        // Nickname in URL, so load the id
-                       fetchUserData(postRequestParameter('userid'), 'nickname');
+                       fetchUserData(postRequestElement('userid'), 'nickname');
                } else {
                        // Direct userid entered
-                       fetchUserData(postRequestParameter('userid'));
+                       fetchUserData(postRequestElement('userid'));
                }
 
                // Is the data valid?
@@ -82,13 +82,13 @@ if (isFormSent()) {
                } // END - if
 
                // Remove any dots and unwanted chars from the points
-               setPostRequestParameter('points', bigintval(round(convertCommaToDot(postRequestParameter('points')))));
+               setPostRequestElement('points', bigintval(round(convertCommaToDot(postRequestElement('points')))));
 
                // Probe for enough points
-               $probe_points = ((postRequestParameter('points') >= getConfig('doubler_min')) && (postRequestParameter('points') <= getConfig('doubler_max')));
+               $probe_points = ((postRequestElement('points') >= getConfig('doubler_min')) && (postRequestElement('points') <= getConfig('doubler_max')));
 
                // Check all together
-               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('password'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
+               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestElement('password'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
                        // Nickname resolved to a unique userid or direct userid entered by the member
                        $GLOBALS['local_doubler_userid'] = getUserData('userid');
 
@@ -96,22 +96,22 @@ if (isFormSent()) {
                        $points = getTotalPoints(getUserData('userid'));
 
                        // So let's continue with probing his points amount
-                       if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge') / 100) >= 0) {
+                       if (($points - getConfig('doubler_left') - postRequestElement('points') * getConfig('doubler_charge') / 100) >= 0) {
                                // Enough points are left so let's continue with the doubling process
                                // Create doubling "account" with *DOUBLED* points
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(), 'N','N')",
                                        array(
                                                getUserData('userid'),
                                                makeZeroToNull(determineReferalId()),
-                                               bigintval(postRequestParameter('points') * 2),
+                                               bigintval(postRequestElement('points') * 2),
                                                detectRemoteAddr()
                                        ), __FILE__, __LINE__);
 
                                // Subtract entered points and ignore return status
-                               subtractPoints('doubler', getUserData('userid'), postRequestParameter('points'));
+                               subtractPoints('doubler', getUserData('userid'), postRequestElement('points'));
 
                                // Add points to "total payed" including charge
-                               $points = postRequestParameter('points') - postRequestParameter('points') * getConfig('doubler_charge') / 100;
+                               $points = postRequestElement('points') - postRequestElement('points') * getConfig('doubler_charge') / 100;
                                updateConfiguration('doubler_points', $points, '+');
                                incrementConfigEntry('doubler_points', $points);
 
@@ -121,7 +121,7 @@ if (isFormSent()) {
                                        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`,`refid`,`points`,`remote_ip`,`timemark`,`completed`,`is_ref`) VALUES (%s,0,%s,'%s',UNIX_TIMESTAMP(),'N','Y')",
                                                array(
                                                        makeZeroToNull(determineReferalId()),
-                                                       (postRequestParameter('points') * 2 * getConfig('doubler_ref') / 100),
+                                                       (postRequestElement('points') * 2 * getConfig('doubler_ref') / 100),
                                                        detectRemoteAddr()
                                                ), __FILE__, __LINE__);
 
@@ -132,7 +132,7 @@ if (isFormSent()) {
                                updateConfiguration('doubler_counter', 1, '+');
 
                                // Set constant
-                               $content['message'] = loadTemplate('doubler_reflink', true, postRequestParameter('userid'));
+                               $content['message'] = loadTemplate('doubler_reflink', true, postRequestElement('userid'));
                        } else {
                                // Not enougth points left
                                $content['message'] = '{--DOUBLER_FORM_NO_POINTS_LEFT--}';
@@ -146,26 +146,26 @@ if (isFormSent()) {
                } elseif (getUserData('status') == 'LOCKED') {
                        // Account is locked by admin / holiday!
                        $content['message'] = '{--DOUBLER_FORM_STATUS_LOCKED--}';
-               } elseif (postRequestParameter('points') < getConfig('doubler_min')) {
+               } elseif (postRequestElement('points') < getConfig('doubler_min')) {
                        // Not enougth points entered
                        $content['message'] = '{--DOUBLER_FORM_POINTS_MIN--}';
-               } elseif (postRequestParameter('points') > getConfig('doubler_max')) {
+               } elseif (postRequestElement('points') > getConfig('doubler_max')) {
                        // Too much points entered
                        $content['message'] = '{--DOUBLER_FORM_POINTS_MAX--}';
-               } elseif (isNicknameUsed(postRequestParameter('userid'))) {
+               } elseif (isNicknameUsed(postRequestElement('userid'))) {
                        // Cannot resolv nickname -> userid
                        $content['message'] = '{--DOUBLER_FORM_404_NICKNAME--}';
                } else {
                        // Wrong password or account not found
                        $content['message'] = '{--DOUBLER_FORM_404_MEMBER--}';
                }
-       } elseif (!isPostRequestParameterSet('userid')) {
+       } elseif (!isPostRequestElementSet('userid')) {
                // Login not entered
                $content['message'] = '{--DOUBLER_FORM_404_LOGIN--}';
-       } elseif (!isPostRequestParameterSet('password')) {
+       } elseif (!isPostRequestElementSet('password')) {
                // Password not entered
                $content['message'] = '{--DOUBLER_FORM_404_PASSWORD--}';
-       } elseif (!isPostRequestParameterSet('points')) {
+       } elseif (!isPostRequestElementSet('points')) {
                // points not entered
                $content['message'] = '{--DOUBLER_FORM_404_POINTS--}';
        }
diff --git a/img.php b/img.php
index bb83665..4008ceb 100644 (file)
--- a/img.php
+++ b/img.php
@@ -49,13 +49,13 @@ require('inc/config-global.php');
 loadIncludeOnce('inc/header.php');
 
 // Code set?
-if (isGetRequestParameterSet('code')) {
+if (isGetRequestElementSet('code')) {
        // Generate image
-       generateImageOrCode(bigintval(getRequestParameter('code')));
-} elseif (isGetRequestParameterSet('img')) {
+       generateImageOrCode(bigintval(getRequestElement('code')));
+} elseif (isGetRequestElementSet('img')) {
        // 'img' set so create the IFN (Include-FileName)
        $inc = sprintf("inc/img/tag-%s.php",
-               getRequestParameter('img')
+               getRequestElement('img')
        );
 
        // Include is readable?
index 0d7456a..b04e3ba 100644 (file)
@@ -1040,7 +1040,7 @@ function doXmlCallbackFunctionExecute ($callbackFunction, $args) {
        // Is 'id_index' set and form sent?
        if ((isset($args['id_index'])) && (isFormSent())) {
                // Prepare 'id_index'
-               $args['id_index'] = postRequestParameter($args['id_index']);
+               $args['id_index'] = postRequestElement($args['id_index']);
        } // END - if
 
        // Just call it
index a7dcfca..44279d6 100644 (file)
@@ -318,7 +318,7 @@ function doExpressionMath ($data) {
 // Expression call-back for GET request
 function doExpressionGet ($data) {
        // Construct the replacer
-       $replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+       $replacer = '{%pipe,getRequestElement=' . $data['value'] . '%}';
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
@@ -330,7 +330,7 @@ function doExpressionGet ($data) {
 // Expression call-back for POST request
 function doExpressionPost ($data) {
        // Construct the replacer
-       $replacer = '{%pipe,postRequestParameter=' . $data['value'] . '%}';
+       $replacer = '{%pipe,postRequestElement=' . $data['value'] . '%}';
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);
index 3cd5d7d..49bad6f 100644 (file)
@@ -232,7 +232,7 @@ INDEX (`userid`)",
                                addConfigAddSql('beg_include_own', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Eigene Mitglieder-Ids sind von der Bettel-Rallye nun ausschliessbar.");
+                               setExtensionUpdateNotes("Eigene Mitglied-Ids sind von der Bettel-Rallye nun ausschliessbar.");
                                break;
 
                        case '0.2.3': // SQL queries for v0.2.3
index 375853e..f514d03 100644 (file)
@@ -476,7 +476,7 @@ ORDER BY
                                break;
 
                        case '0.7.6': // SQL queries for v0.7.6
-                               setExtensionUpdateNotes("Auswahlmechanismus der Gewinner repariert. Trotz Hinzuschalten von weiteren zu ber&uuml;cksichtigen Boni wurden diese bei der Sortierung der Mitglieder-Ids nicht ber&uuml;cksichtig.");
+                               setExtensionUpdateNotes("Auswahlmechanismus der Gewinner repariert. Trotz Hinzuschalten von weiteren zu ber&uuml;cksichtigen Boni wurden diese bei der Sortierung der Mitglied-Ids nicht ber&uuml;cksichtig.");
                                break;
 
                        case '0.7.7': // SQL queries for v0.7.7
@@ -515,7 +515,7 @@ ORDER BY
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_bonus` ADD `is_notify` ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Eigene Mitglieder-Ids sind von der Aktiv-Rallye nun ausschliessbar. Benachrichtigungsmails sind von Aktiv-Rallye ausgeschlossen.");
+                               setExtensionUpdateNotes("Eigene Mitglied-Ids sind von der Aktiv-Rallye nun ausschliessbar. Benachrichtigungsmails sind von Aktiv-Rallye ausgeschlossen.");
                                break;
 
                        case '0.8.3': // SQL queries for v0.8.3
index 3c74109..538d7cf 100644 (file)
@@ -140,7 +140,7 @@ INDEX (`userid`)",
                switch (getCurrentExtensionVersion()) {
                        case '0.0.1': // SQL queries for v0.0.1
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Problem mit Mitglieder-Id behoben.");
+                               setExtensionUpdateNotes("Problem mit Mitglied-Id behoben.");
                                break;
 
                        case '0.0.2': // SQL queries for v0.0.2
diff --git a/inc/extensions/ext-earning.php b/inc/extensions/ext-earning.php
new file mode 100644 (file)
index 0000000..a4b61dd
--- /dev/null
@@ -0,0 +1,134 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/02/2011 *
+ * ===================                          Last change: 08/02/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ext-earning.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : Extra earnings for members                       *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Zusatzverdienste fuer Mitglieder                 *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Version number
+setThisExtensionVersion('0.0.0');
+
+// Version history array (add more with , '0.0.1' and so on)
+setExtensionVersionHistory(array('0.0.0'));
+
+// This extension is in development (non-productive)
+enableExtensionProductive(false);
+
+switch (getExtensionMode()) {
+       case 'register': // Do stuff when installation is running
+               // Add member menu
+               addMemberMenuSql('earn', 'earnings', 'Zusatzverdienste', 2);
+
+               // Admin menu
+               addAdminMenuSql('setup', 'list_earnings', 'Zusatzverdienste...', 'Veralten Sie hier bequem alle Zusatzverdienste (wie z.B. verg&uuml;tete PopUps usw.).', 6);
+
+               // Earning data table
+               addDropTableSql('earning_data');
+               addCreateTableSql('earning_data', "
+`earning_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`earning_group` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
+`earning_name` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
+`earning_sorting` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+PRIMARY KEY (`earning_id`),
+UNIQUE `earning_group_name` (`earning_group`,`earning_name`)",
+                       'Registered (extra) earnings');
+
+               // User->earnings connection table
+               addDropTableSql('user_earning');
+               addCreateTableSql('user_earning', "
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`earning_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`earning_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`earning_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
+`earning_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`earning_cancelled` TIMESTAMP NULL DEFAULT NULL,
+`earning_daily_amount` SMALLINT(7) NOT NULL DEFAULT 0,
+`earning_points` FLOAT(20,5) NOT NULL DEFAULT 0.00000,
+PRIMARY KEY (`id`),
+UNIQUE `user_earning` (`earning_id`,`earning_userid`),
+INDEX (`earning_userid`)",
+                       'User->Earning connections');
+               break;
+
+       case 'remove': // Do stuff when removing extension
+               // Drop tables
+               addDropTableSql('earning_data');
+               addDropTableSql('user_earning');
+
+               // Delete entries in menus
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='earnings' LIMIT 1");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='list_earnings' LIMIT 1");
+               break;
+
+       case 'activate': // Do stuff when admin activates this extension
+               // SQL commands to run
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='earnings' LIMIT 1");
+               break;
+
+       case 'deactivate': // Do stuff when admin deactivates this extension
+               // SQL commands to run
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='earnings' LIMIT 1");
+               break;
+
+       case 'update': // Update an extension
+               switch (getCurrentExtensionVersion()) {
+                       case '0.0.1': // SQL queries for v0.0.1
+                               addExtensionSql('');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes('');
+                               break;
+               } // END - switch
+               break;
+
+       case 'modify': // When the extension got modified
+               break;
+
+       case 'test': // For testing purposes
+               break;
+
+       case 'init': // Do stuff when extension is initialized
+               break;
+
+       default: // Unknown extension mode
+               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+               break;
+} // END - switch
+
+// [EOF]
+?>
index 15b488e..fc0eb66 100644 (file)
@@ -51,8 +51,8 @@ enableExtensionProductive(false);
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
-               // Add dependency for ext-sql_patches
-               addExtensionDependency('sql_patches');
+               // Add dependency for ext-earning
+               addExtensionDependency('earning');
 
                // All required tables for this extension:
                // - Ads
@@ -136,8 +136,9 @@ INDEX (`forced_stats_userid`)",
                // Register Forced-PopUps with earning_data table
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_earning_data` (`earning_group`,`earning_name`,`earning_sorting`) VALUES ('POPUP','FORCED_POPUP',1)");
 
-               // Register filter for default forced ad types
+               // Register filters
                registerFilter('add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', false, true, isExtensionDryRun());
+               registerFilter('member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', false, true, isExtensionDryRun());
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -156,6 +157,7 @@ INDEX (`forced_stats_userid`)",
 
                // Remove filter
                unregisterFilter(__FUNCTION__, __LINE__, 'add_forced_ads_types', 'FORCED_AD_TYPE_DEFAULTS', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'member_earning_table_data', 'FORCED_POPUP_TABLE_DATA', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
index cccb291..da13a58 100644 (file)
@@ -131,12 +131,12 @@ switch (getExtensionMode()) {
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` DROP nick_userid");
 
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Auswahlf&uuml;r Mitglied ob mit Nickname oder Mitglieder-Id einloggen entfernt.");
+                               setExtensionUpdateNotes("Auswahlf&uuml;r Mitglied ob mit Nickname oder Mitglied-Id einloggen entfernt.");
                                break;
 
                        case '0.1.2': // SQL queries for v0.1.2
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Zum Zusenden eines neuen Passwortes kann jetzt entweder der Nickname / Mitglieder-Id <u>ODER</u> die angemeldete EMail-Adresse eingegeben werden.");
+                               setExtensionUpdateNotes("Zum Zusenden eines neuen Passwortes kann jetzt entweder der Nickname / Mitglied-Id <u>ODER</u> die angemeldete EMail-Adresse eingegeben werden.");
                                break;
 
                        case '0.1.3': // SQL queries for v0.1.3
index b6b738d..d2f04f2 100644 (file)
@@ -77,8 +77,7 @@ IN (
        'config_proxy',
        'config_session',
        'list_filter',
-       'list_point_accounts',
-       'list_earnings'
+       'list_point_accounts'
 )");
 
                // Delete/update member menu entries
@@ -192,7 +191,7 @@ IN (
                                break;
 
                        case '0.1.2': // SQL queries for v0.1.2
-                               addAdminMenuSql('setup','config_refid','Standard-Ref-Id','Stellen Sie hier die Mitglieder-Id ein, die genommen werden soll, wenn der Gast n icht per Referal-Link Ihren {?mt_word?} aufgerufen hat.', 7);
+                               addAdminMenuSql('setup','config_refid','Standard-Ref-Id','Stellen Sie hier die Mitglied-Id ein, die genommen werden soll, wenn der Gast n icht per Referal-Link Ihren {?mt_word?} aufgerufen hat.', 7);
                                addConfigAddSql('def_refid', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
 
                                // Update notes (these will be set as task text!)
@@ -874,41 +873,8 @@ INDEX (`history_last_used` DESC)",
                                // Old-lost configuration entry
                                addConfigDropSql('ext_autopurge');
 
-                               // Extra earning for our members :-)
-                               addMemberMenuSql('earn', 'earnings', 'Zusatzverdienste', 2);
-
-                               // Admin menu
-                               addAdminMenuSql('setup', 'list_earnings', 'Zusatzverdienste...', 'Veralten Sie hier bequem alle Zusatzverdienste (wie z.B. verg&uuml;tete PopUps usw.).', 6);
-
-                               // Earning data table
-                               addDropTableSql('earning_data');
-                               addCreateTableSql('earning_data', "
-`earning_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-`earning_group` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
-`earning_name` VARCHAR(255) NOT NULL DEFAULT 'INVALID',
-`earning_sorting` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-PRIMARY KEY (`earning_id`),
-UNIQUE `earning_group_name` (`earning_group`,`earning_name`)",
-                                       'Registered (extra) earnings');
-
-                               // User->earnings connection table
-                               addDropTableSql('user_earning');
-                               addCreateTableSql('user_earning', "
-`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-`earning_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`earning_userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`earning_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
-`earning_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-`earning_cancelled` TIMESTAMP NULL DEFAULT NULL,
-`earning_daily_amount` SMALLINT(7) NOT NULL DEFAULT 0,
-`earning_points` FLOAT(20,5) NOT NULL DEFAULT 0.00000,
-PRIMARY KEY (`id`),
-UNIQUE `user_earning` (`earning_id`,`earning_userid`),
-INDEX (`earning_userid`)",
-                                       'User->Earning connections');
-
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Men&uuml;punkt f&uuml;r Zusatzverdienste wie z.B. Forced-PopUps hinzugef&uuml;gt und uralten Konfigurationseintrag entfernt.");
+                               setExtensionUpdateNotes("Uralten Konfigurationseintrag entfernt.");
                                break;
                } // END - switch
                break;
index 056064b..7b367ad 100644 (file)
@@ -191,7 +191,7 @@ switch (getExtensionMode()) {
 
                        case '0.2.3': // SQL queries for v0.2.3
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Sortierungsreihenfolge grundlegend ge&auml;ndert: Es wird jetzt nach Mitglieder-Id, Aufgabenbereich, Infos und nach dem Erstellunsdatum sortiert.");
+                               setExtensionUpdateNotes("Sortierungsreihenfolge grundlegend ge&auml;ndert: Es wird jetzt nach Mitglied-Id, Aufgabenbereich, Infos und nach dem Erstellunsdatum sortiert.");
                                break;
 
                        case '0.2.4': // SQL queries for v0.2.4
index 4520937..bd13b97 100644 (file)
@@ -71,7 +71,7 @@ LIMIT 1',
                $bonus = (!SQL_HASZEROAFFECTED());
        } // END - if
 
-       if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
+       if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } else {
index 4076911..4b69b26 100644 (file)
@@ -61,5 +61,22 @@ function FILTER_FORCED_AD_TYPE_DEFAULTS ($data) {
        return $data;
 }
 
+// Filter for collecting data for the member table
+function FILTER_FORCED_POPUP_TABLE_DATA ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+       // Is this the right filter?
+       if ($filterData['earning_name'] == 'FORCED_POPUP') {
+               // Set group
+               $filterData['earning_group'] = 'POPUP';
+
+               // Get max/min/count of all popups
+               //die(__FUNCTION__.':OK!');
+       } // END - if
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+
+       // Return filter data array
+       return $filterData;
+}
+
 // [EOF]
 ?>
index 4bed3d6..5b99edd 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_DISPLAY_DEBUG_SQL ($filterData) {
        // Shall we display SQL queries?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ((isAdmin()) && (isDisplayDebugSqlEnabled()) && (!isGetRequestParameterSet('frame')) && ($GLOBALS['header_sent'] == 2)) {
+       if ((isAdmin()) && (isDisplayDebugSqlEnabled()) && (!isGetRequestElementSet('frame')) && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayDebugSqls();
        } // END - if
index c657bdb..d77bc99 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_DISPLAY_POLITICIAN_STOP_SNIPPET ($filterData) {
        // Shall we include the politician_stop snippet?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ((!isGetRequestParameterSet('frame')) && (isExtensionActive('politician_stop')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestElementSet('frame')) && (isExtensionActive('politician_stop')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                loadPoliticianStopSnippet();
        } // END - if
index 4c8de5c..6c2ea26 100644 (file)
@@ -44,9 +44,9 @@ if (!defined('__SECURITY')) {
 function FILTER_HANDLE_THEME_CHANGE ($filterData) {
        // Check if new theme is selcted
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
+       if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
                // Set new theme for guests
-               $newTheme = postRequestParameter('new_theme');
+               $newTheme = postRequestElement('new_theme');
 
                // Change to new theme
                setTheme($newTheme);
index cf73322..f117e5e 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function FILTER_DISPLAY_UBERWACH_SNIPPET ($filterData) {
        // Shall we include the uberwach snippet?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ((!isGetRequestParameterSet('frame')) && (isExtensionActive('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestElementSet('frame')) && (isExtensionActive('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                loadUberwachSnippet();
        } // END - if
index 03943c8..903dd69 100644 (file)
@@ -688,9 +688,9 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                // Fix module
                if (!isModuleSet()) {
                        // Is the request element set?
-                       if (isGetRequestParameterSet('module')) {
+                       if (isGetRequestElementSet('module')) {
                                // Set module from request
-                               setModule(getRequestParameter('module'));
+                               setModule(getRequestElement('module'));
                        } elseif (isHtmlOutputMode()) {
                                // Set default module 'index'
                                setModule('index');
@@ -774,7 +774,7 @@ function FILTER_RUN_DAILY_RESET () {
        } // END - if
 
        // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-       if (((getDay(getConfig('last_update')) != getDay()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
+       if (((getDay(getConfig('last_update')) != getDay()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
                // Tell every module we are in reset-mode!
                doReset();
        } // END - if
@@ -788,7 +788,7 @@ function FILTER_RUN_HOURLY_RESET () {
        } // END - if
 
        // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-       if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) {
+       if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) {
                // Tell every module we are in reset-mode!
                doHourly();
        } // END - if
@@ -934,7 +934,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 // Filter for displaying copyright line
 function FILTER_DISPLAY_COPYRIGHT () {
        // Shall we display the copyright notice?
-       if ((!isGetRequestParameterSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
                // Backlink enabled?
                if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
                        // Copyright with backlink, thanks! :-)
@@ -950,7 +950,7 @@ function FILTER_DISPLAY_COPYRIGHT () {
 function FILTER_DISPLAY_PARSING_TIME () {
        // Shall we display the parsing time and number of queries?
        // 1234                            5                      54    4         5              5       4    4                       5       543    3                   4432    2             33     2    2                              21
-       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayParsingTime();
        } // END - if
index a5cd6ed..df40ef0 100644 (file)
@@ -1185,11 +1185,11 @@ function getMessageFromErrorCode ($code) {
                case getCode('COOKIES_DISABLED')   : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
                case getCode('BEG_SAME_AS_OWN')    : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break;
                case getCode('LOGIN_FAILED')       : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
-               case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestParameter('mod') . '%}'; break;
+               case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestElement('mod') . '%}'; break;
                case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
                case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
                case getCode('SUBJECT_URL')        : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
-               case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
+               case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestElement('blist'), 0); break;
                case getCode('NO_RECS_LEFT')       : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break;
                case getCode('INVALID_TAGS')       : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break;
                case getCode('MORE_POINTS')        : $message = '{--MEMBER_MORE_POINTS_NEEDED--}'; break;
@@ -1211,8 +1211,8 @@ function getMessageFromErrorCode ($code) {
                        break;
 
                case getCode('EXTENSION_PROBLEM'):
-                       if (isGetRequestParameterSet('ext')) {
-                               $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}';
+                       if (isGetRequestElementSet('ext')) {
+                               $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestElement('ext') . '%}';
                        } else {
                                $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
                        }
@@ -1221,7 +1221,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('URL_TIME_LOCK'):
                        // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
                        $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-                               array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
+                               array(bigintval(getRequestElement('id'))), __FUNCTION__, __LINE__);
 
                        // Load timestamp from last order
                        $content = SQL_FETCHARRAY($result);
@@ -1655,22 +1655,22 @@ function determineReferalId () {
        if (isReferalIdValid()) {
                // This is fine...
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')');
-       } elseif (isPostRequestParameterSet('refid')) {
+       } elseif (isPostRequestElementSet('refid')) {
                // Get referal id from POST element refid
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestParameter('refid') . ')');
-               setReferalId(secureString(postRequestParameter('refid')));
-       } elseif (isGetRequestParameterSet('refid')) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestElement('refid') . ')');
+               setReferalId(secureString(postRequestElement('refid')));
+       } elseif (isGetRequestElementSet('refid')) {
                // Get referal id from GET parameter refid
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestParameter('refid') . ')');
-               setReferalId(secureString(getRequestParameter('refid')));
-       } elseif (isGetRequestParameterSet('ref')) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestElement('refid') . ')');
+               setReferalId(secureString(getRequestElement('refid')));
+       } elseif (isGetRequestElementSet('ref')) {
                // Set refid=ref (the referal link uses such variable)
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestParameter('refid') . ')');
-               setReferalId(secureString(getRequestParameter('ref')));
-       } elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('refid') . ')');
+               setReferalId(secureString(getRequestElement('ref')));
+       } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
                // The variable user comes from  click.php
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestParameter('user') . ')');
-               setReferalId(bigintval(getRequestParameter('user')));
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')');
+               setReferalId(bigintval(getRequestElement('user')));
        } elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
                // Set session refid as global
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')');
index 0f592ed..eac5b4e 100644 (file)
@@ -63,7 +63,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 } // END - if
 
 // Add BODY tag or not?
-if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
+if ((!isCssOutputMode()) && (!isRawOutputMode()) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if
index b989100..5cbe936 100644 (file)
@@ -43,27 +43,27 @@ if (!defined('__SECURITY')) {
 // Write the local config-local.php file from "template"
 function doInstallWriteLocalConfig () {
        // Copy the config template and verify it
-       copyFileVerified(postRequestParameter('spath') . 'inc/config-local.php.dist', getPath() . getCachePath() . 'config-local.php', 0644);
+       copyFileVerified(postRequestElement('spath') . 'inc/config-local.php.dist', getPath() . getCachePath() . 'config-local.php', 0644);
 
        // Ok, all done. So we can write the config data to the php files
-       if (postRequestParameter('spath') != getPath()) changeDataInLocalConfigurationFile('SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestParameter('spath'), 0);
-       if (postRequestParameter('burl')  != getUrl())  changeDataInLocalConfigurationFile('HOST-URL', "setConfigEntry('URL', '", "');", postRequestParameter('burl'), 0);
-       changeDataInLocalConfigurationFile('MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestParameter('title'), 0);
-       changeDataInLocalConfigurationFile('SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestParameter('slogan'), 0);
-       changeDataInLocalConfigurationFile('WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestParameter('email'), 0);
-       changeDataInLocalConfigurationFile('NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestParameter('warn_no_pass'), 0);
-       changeDataInLocalConfigurationFile('WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestParameter('wfooter'), 0);
-       changeDataInLocalConfigurationFile('BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestParameter('blink'), 0);
-       // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-       changeDataInLocalConfigurationFile('MYSQL-HOST', "      'host'     => '", "',", postRequestParameter('mysql','host'), 0);
-       changeDataInLocalConfigurationFile('MYSQL-DBASE', "     'dbase'    => '", "',", postRequestParameter('mysql','dbase'), 0);
-       changeDataInLocalConfigurationFile('MYSQL-LOGIN', "     'login'    => '", "',", postRequestParameter('mysql','login'), 0);
-       changeDataInLocalConfigurationFile('MYSQL-PASSWORD', "  'password' => '", "',", postRequestParameter('mysql','pass1'), 0);
-       changeDataInLocalConfigurationFile('MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestParameter('mysql','prefix'), 0);
-       changeDataInLocalConfigurationFile('TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestParameter('mysql','type'), 0);
-       changeDataInLocalConfigurationFile('SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestParameter('smtp_host'), 0);
-       changeDataInLocalConfigurationFile('SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestParameter('smtp_user'), 0);
-       changeDataInLocalConfigurationFile('SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestParameter('smtp_pass1'), 0);
+       if (postRequestElement('spath') != getPath()) changeDataInLocalConfigurationFile('SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestElement('spath'), 0);
+       if (postRequestElement('burl')  != getUrl())  changeDataInLocalConfigurationFile('HOST-URL', "setConfigEntry('URL', '", "');", postRequestElement('burl'), 0);
+       changeDataInLocalConfigurationFile('MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestElement('title'), 0);
+       changeDataInLocalConfigurationFile('SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestElement('slogan'), 0);
+       changeDataInLocalConfigurationFile('WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestElement('email'), 0);
+       changeDataInLocalConfigurationFile('NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestElement('warn_no_pass'), 0);
+       changeDataInLocalConfigurationFile('WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestElement('wfooter'), 0);
+       changeDataInLocalConfigurationFile('BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestElement('blink'), 0);
+       // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
+       changeDataInLocalConfigurationFile('MYSQL-HOST', "      'host'     => '", "',", postRequestElement('mysql','host'), 0);
+       changeDataInLocalConfigurationFile('MYSQL-DBASE', "     'dbase'    => '", "',", postRequestElement('mysql','dbase'), 0);
+       changeDataInLocalConfigurationFile('MYSQL-LOGIN', "     'login'    => '", "',", postRequestElement('mysql','login'), 0);
+       changeDataInLocalConfigurationFile('MYSQL-PASSWORD', "  'password' => '", "',", postRequestElement('mysql','pass1'), 0);
+       changeDataInLocalConfigurationFile('MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestElement('mysql','prefix'), 0);
+       changeDataInLocalConfigurationFile('TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestElement('mysql','type'), 0);
+       changeDataInLocalConfigurationFile('SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestElement('smtp_host'), 0);
+       changeDataInLocalConfigurationFile('SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestElement('smtp_user'), 0);
+       changeDataInLocalConfigurationFile('SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestElement('smtp_pass1'), 0);
 
        // Generate a long site key
        $siteKey = generatePassword(50);
index 18af33b..378c60b 100644 (file)
@@ -55,43 +55,43 @@ FILTER_INIT_TIMEZONE(array());
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
-if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
        // Transfer 'mysql' array
-       $GLOBALS['install_mysql'] = postRequestParameter('mysql');
+       $GLOBALS['install_mysql'] = postRequestElement('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
-if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
+if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
        // Okay, we have to check it
-       if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
+       if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
                // Hostname not set
                addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
+       if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
                // Password is empty
-               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASSWORD1_EMPTY--}</div>');
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
+       if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
                // Password repeat is empty
-               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASSWORD2_EMPTY--}</div>');
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
+       if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
                // Passwords are not matching
                addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
-               setGetRequestParameter('page', 3);
+               setGetRequestElement('page', 3);
        } // END - if
 } // END - if
 
 // Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Output page for entered value
-       switch (getRequestParameter('page')) {
+       switch (getRequestElement('page')) {
                case 'welcome': // Welcome to the installation!
                        addTemplateToInstallContent('install_welcome');
                        break;
@@ -120,11 +120,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
                        $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
                        $content['table_type']   = $GLOBALS['install_mysql']['type'];
-                       $content['spath']        = postRequestParameter('spath');
-                       $content['burl']         = postRequestParameter('burl');
-                       $content['title']        = postRequestParameter('title');
-                       $content['slogan']       = postRequestParameter('slogan');
-                       $content['email']        = postRequestParameter('email');
+                       $content['spath']        = postRequestElement('spath');
+                       $content['burl']         = postRequestElement('burl');
+                       $content['title']        = postRequestElement('title');
+                       $content['slogan']       = postRequestElement('slogan');
+                       $content['email']        = postRequestElement('email');
 
                        // Load template
                        addTemplateToInstallContent('install_page2', $content);
@@ -132,11 +132,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '3':
                        // Set more values
-                       $content['spath']      = postRequestParameter('spath');
-                       $content['burl']       = postRequestParameter('burl');
-                       $content['title']      = postRequestParameter('title');
-                       $content['slogan']     = postRequestParameter('slogan');
-                       $content['email']      = postRequestParameter('email');
+                       $content['spath']      = postRequestElement('spath');
+                       $content['burl']       = postRequestElement('burl');
+                       $content['title']      = postRequestElement('title');
+                       $content['slogan']     = postRequestElement('slogan');
+                       $content['email']      = postRequestElement('email');
 
                        // Use default SMTP data
                        $smtpHost  = '{?SMTP_HOSTNAME?}';
@@ -145,11 +145,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $smtpPass2 = '{?SMTP_PASSWORD?}';
 
                        // Overwrite it with the data from sent (failed) form
-                       if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
-                       if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user');
-                       if (isPostRequestParameterSet('smtp_pass')) {
-                               $smtpPass1 = postRequestParameter('smtp_pass');
-                               $smtpPass2 = postRequestParameter('smtp_pass');
+                       if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
+                       if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
+                       if (isPostRequestElementSet('smtp_pass')) {
+                               $smtpPass1 = postRequestElement('smtp_pass');
+                               $smtpPass2 = postRequestElement('smtp_pass');
                        } // END - if
 
                        // Database login data
@@ -173,16 +173,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '5': // Misc settings
                        // General settings
-                       $content['spath']  = postRequestParameter('spath');
-                       $content['burl']   = postRequestParameter('burl');
-                       $content['title']  = postRequestParameter('title');
-                       $content['slogan'] = postRequestParameter('slogan');
-                       $content['email']  = postRequestParameter('email');
+                       $content['spath']  = postRequestElement('spath');
+                       $content['burl']   = postRequestElement('burl');
+                       $content['title']  = postRequestElement('title');
+                       $content['slogan'] = postRequestElement('slogan');
+                       $content['email']  = postRequestElement('email');
 
                        // SMTP settings
-                       $content['smtp_host'] = postRequestParameter('smtp_host');
-                       $content['smtp_user'] = postRequestParameter('smtp_user');
-                       $content['smtp_pass'] = postRequestParameter('smtp_pass1');
+                       $content['smtp_host'] = postRequestElement('smtp_host');
+                       $content['smtp_user'] = postRequestElement('smtp_user');
+                       $content['smtp_pass'] = postRequestElement('smtp_pass1');
 
                        // Database login data
                        $OUT = '';
@@ -196,7 +196,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                case 'finalize': // Write captured data to files
-                       if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
+                       if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
@@ -215,7 +215,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        // Seems to work, also right database?
                                        if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
                                                // Check for dumps
-                                               if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                                               if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found
                                                        debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
                                                        return;
@@ -224,13 +224,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // Any errors detected?
                                                if (!ifFatalErrorsDetected()) {
                                                        // Set type and prefix from POST data
-                                                       setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
-                                                       setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
+                                                       setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
+                                                       setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
 
                                                        // Both exists so import them
                                                        foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
                                                                // Should be save here because file_exists() is there but we check it again. :)
-                                                               $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
+                                                               $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
 
                                                                // Is the file readable?
                                                                if (isFileReadable($FQFN)) {
@@ -273,12 +273,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                                        } // END foreach
                                        $content['mysql_hidden'] = $OUT;
-                                       $content['spath']      = postRequestParameter('spath');
-                                       $content['burl']       = postRequestParameter('burl');
-                                       $content['title']      = postRequestParameter('title');
-                                       $content['smtp_host']  = postRequestParameter('smtp_host');
-                                       $content['smtp_user']  = postRequestParameter('smtp_user');
-                                       $content['smtp_pass']  = postRequestParameter('smtp_pass1');
+                                       $content['spath']      = postRequestElement('spath');
+                                       $content['burl']       = postRequestElement('burl');
+                                       $content['title']      = postRequestElement('title');
+                                       $content['smtp_host']  = postRequestElement('smtp_host');
+                                       $content['smtp_user']  = postRequestElement('smtp_user');
+                                       $content['smtp_pass']  = postRequestElement('smtp_pass1');
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
@@ -306,7 +306,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
                        addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
                        break;
        } // END - switch
index 25bc676..d071bd1 100644 (file)
@@ -46,15 +46,15 @@ if (!defined('__SECURITY')) {
 SURFBAR_INIT();
 
 // Init data
-SURFBAR_DETERMINE_NEXT_ID(getRequestParameter('url_id'));
+SURFBAR_DETERMINE_NEXT_ID(getRequestElement('url_id'));
 
 // Check reload-locks
 SURFBAR_CHECK_RELOAD_FULL();
 
 // Prepare content
 $content = array(
-       'url_id' => bigintval(getRequestParameter('url_id')),
-       'check'  => SURFBAR_GENERATE_VALIDATION_CODE(getRequestParameter('url_id'), SURFBAR_GET_LAST_SALT()),
+       'url_id' => bigintval(getRequestElement('url_id')),
+       'check'  => SURFBAR_GENERATE_VALIDATION_CODE(getRequestElement('url_id'), SURFBAR_GET_LAST_SALT()),
        'salt'   => SURFBAR_GET_LAST_SALT(),
 );
 
index 237011b..4af95a7 100644 (file)
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 
 // Prepare content
 $content = array(
-       'views_max' => bigintval(getRequestParameter('views_max')),
-       'limited'   => bigintval(getRequestParameter('limited'))
+       'views_max' => bigintval(getRequestElement('views_max')),
+       'limited'   => bigintval(getRequestElement('limited'))
 );
 
 // Simply load the JavaScript here
index b9b0d82..ad1d050 100644 (file)
@@ -129,9 +129,9 @@ function getLanguage () {
                } // END - if
 
                // Is the variable set
-               if (isGetRequestParameterSet('mailer_lang')) {
+               if (isGetRequestElementSet('mailer_lang')) {
                        // Accept only first 2 chars
-                       $ret = substr(getRequestParameter('mailer_lang'), 0, 2);
+                       $ret = substr(getRequestElement('mailer_lang'), 0, 2);
                } elseif (isCurrentLanguageSet()) {
                        // Use cached
                        $ret = getCurrentLanguage();
index f9fc64f..3039d7d 100644 (file)
@@ -46,8 +46,8 @@ addMessages(array(
        'ADMIN_ADMINS_ADD_ADMIN' => "Hinzuf&uuml;gen",
        'ADMIN_ADMINS_ENTER_LOGIN' => "Loginname eingeben",
        'ADMIN_ADMINS_ENTER_EMAIL' => "E-Mail eingeben",
-       'ADMIN_ADMINS_ENTER_PASS1' => "Passwort eingeben",
-       'ADMIN_ADMINS_ENTER_PASS2' => "Passwort wiederholen",
+       'ADMIN_ADMINS_ENTER_PASSWORD1' => "Passwort eingeben",
+       'ADMIN_ADMINS_ENTER_PASSWORD2' => "Passwort wiederholen",
        'ADMIN_ADMINS_ADD_DONE' => "Das Admin-Account wurde angelegt.",
        'ADMIN_ADMINS_EDIT_ACCOUNTS_TITLE' => "Admin-Accounts bearbeiten",
        'ADMIN_ADMINS_EDIT_DELETE_ACCOUNTS_TITLE' => "Admin-Accounts verwalten",
index f182631..427392c 100644 (file)
@@ -45,7 +45,7 @@ addMessages(array(
        'ADMIN_CONFIG_BEG_TITLE' => "Einstellungen am Bettel-Link",
        'ADMIN_CONFIG_BEG_POINTS' => "{?POINTS?}-Gutschrift bei Klick auf Bettel-Link",
        'ADMIN_CONFIG_BEG_TIMEOUT' => "Zeitsperre global",
-       'ADMIN_CONFIG_BEG_USERID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id",
+       'ADMIN_CONFIG_BEG_USERID_TIMEOUT' => "Zeitsperre gegen eine Mitglied-Id",
        'ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT' => "Zeitsperre gegen eine IP-Nummer",
        'BEG_LINK_BY' => "Bettel-Link bei <strong>{?MAIN_TITLE?}</strong>",
        'BEG_LINK_USERID' => "Unser Mitglied <span class=\"data\">%s</span> hat {?POINTS?} gebettelt.",
@@ -74,10 +74,10 @@ addMessages(array(
        'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
        'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
        'ADMIN_CONFIG_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
-       'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieder-Id ",
+       'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglied-Id ",
        'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ",
        'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.",
-       'BEG_SAME_USERID_AS_OWN' => "Mitglieder-Id des Webmasters benutzt.",
+       'BEG_SAME_USERID_AS_OWN' => "Mitglied-Id des Webmasters benutzt.",
        'MEMBER_BEG_LINK_TITLE' => "Ihr Bettellink zum Bewerben",
 
 // Pay modes
@@ -127,7 +127,7 @@ addMessages(array(
        'ADMIN_CONFIG_BEG_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bettel-Rallye benachrichtigt werden?",
        'ADMIN_CONFIG_BEG_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
        'BEG_NO_LIMITATION' => "Keine IP-Sperre eingerichtet!!.",
-       'ADMIN_CONFIG_BEG_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Bettel-Rallye dran teilnehmen?",
+       'ADMIN_CONFIG_BEG_INCLUDE_OWN' => "Soll Ihre Mitglied-Id an der Bettel-Rallye dran teilnehmen?",
        'ADMIN_LIST_BEG_TITLE' => "Alle Teilnehmer der Bettel-Rallye auflisten",
 
 // Task overview
index 86c397f..126b58f 100644 (file)
@@ -114,7 +114,7 @@ addMessages(array(
        'ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"tiny\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>",
        'ADMIN_CONFIG_BONUS_RALLYE_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bonus-Rallye benachrichtigt werden?",
        'ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
-       'ADMIN_CONFIG_BONUS_RALLYE_INCLUDE_ONW' => "Soll Ihre Mitglieder-Id an der Aktiv-Rallye dran teilnehmen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_INCLUDE_ONW' => "Soll Ihre Mitglied-Id an der Aktiv-Rallye dran teilnehmen?",
        'ADMIN_NOTIFCATION_TITLE' => "Ausgesendete Benachrichtigungen",
        'ADMIN_DELETE_NOTIFY_MAIL' => "Obrige Benachrichtigung entfernen",
        'ADMIN_NOTIFY_MAIL_ALREADY_DELETED' => "Benachrichtigung bereits entfernt.",
index fd514fe..f9baf66 100644 (file)
@@ -69,19 +69,19 @@ addMessages(array(
        'ADMIN_LOGIN' => "Geben Sie Ihren Loginnamen ein",
        'ADMIN_PASS' => "Geben Sie Ihr Passwort ein",
        'ADMIN_ACCOUNT_FIRST_CREATION_LOGIN' => "Geben Sie einen Administrator-Loginnamen ein",
-       'ADMIN_ACCOUNT_FIRST_CREATION_PASS1' => "Vergeben Sie dazu ein Passwort",
-       'ADMIN_ACCOUNT_FIRST_CREATION_PASS2' => "Das Passwort erneut eingeben",
+       'ADMIN_ACCOUNT_FIRST_CREATION_PASSWORD1' => "Vergeben Sie dazu ein Passwort",
+       'ADMIN_ACCOUNT_FIRST_CREATION_PASSWORD2' => "Das Passwort erneut eingeben",
        'ADMIN_NO_PASS' => "Kein Passwort eingegeben!",
        'CLEAR_FORM' => "Nochmal eingeben",
        'ADMIN_ACCOUNT_FIRST_CREATION_SUBMIT' => "Admin-Account erstellen",
        'ADMIN_NO_LOGIN' => "Sie haben keinen Loginnamen eingegeben.",
-       'ADMIN_NO_PASS1' => "Sie haben kein Passwort eingegeben.",
-       'ADMIN_NO_PASS2' => "Sie haben keine Passwortwiederholung eingegeben.",
-       'ADMIN_SHORT_PASS1' => "Das Passwort ist zu kurz! Mindestens {?minium_admin_pass_length?} Zeichen.",
-       'ADMIN_SHORT_PASS2' => "Die Passwortwiederholung ist zu kurz! Mindestens {?minium_admin_pass_length?} Zeichen.",
+       'ADMIN_NO_PASSWORD1' => "Sie haben kein Passwort eingegeben.",
+       'ADMIN_NO_PASSWORD2' => "Sie haben keine Passwortwiederholung eingegeben.",
+       'ADMIN_SHORT_PASSWORD1' => "Das Passwort ist zu kurz! Mindestens {?minium_admin_pass_length?} Zeichen.",
+       'ADMIN_SHORT_PASSWORD2' => "Die Passwortwiederholung ist zu kurz! Mindestens {?minium_admin_pass_length?} Zeichen.",
        'ADMIN_SHORT_PASS' => "Ihr Administratorpasswort ist zu kurz! Mindestens {?minium_admin_pass_length?} Zeichen",
-       'ADMIN_PASS1_MISMATCH' => "Das Passwort stimmt nicht mit der Wiederholung &uuml;berein.",
-       'ADMIN_PASS2_MISMATCH' => "Die Passwortwiederholung stimmt nicht mit dem Passwort &uuml;berein.",
+       'ADMIN_PASSWORD1_MISMATCH' => "Das Passwort stimmt nicht mit der Wiederholung &uuml;berein.",
+       'ADMIN_PASSWORD2_MISMATCH' => "Die Passwortwiederholung stimmt nicht mit dem Passwort &uuml;berein.",
        'ADMIN_LOGIN_ALREADY_REG' => "Das von Ihnen eingegebene Admin-Login existiert bereits.",
        'ADMIN_REGISTER_FAILED' => "Bei der Registrierung eines Admin-Accounts ist ein unerwarteter Fehler unterlaufen.",
        'ADMIN_REGISTER_DONE' => "Das Admin-Account wurde soeben erstellt. Sie k&ouml;nnen sich nun mit den eingegeben Login-Daten einloggen.",
@@ -191,8 +191,8 @@ addMessages(array(
        '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.",
-       'ENTER_PASS1' => "Bitte geben Sie ein Passwort ein.",
-       'ENTER_PASS2' => "Bitte geben Sie noch die Best&auml;tigung Ihres Passwortes ein.",
+       'ENTER_PASSWORD1' => "Bitte geben Sie ein Passwort ein.",
+       'ENTER_PASSWORD2' => "Bitte geben Sie noch die Best&auml;tigung Ihres Passwortes ein.",
        'ENTER_EMAIL' => "Bitte geben Sie Ihre Email-Adresse ein! Diese muss auch erreichbar sein.",
        'ENTER_SURNAME' => "Bitte geben Sie Ihren Vornamen ein.",
        'ENTER_FAMILY' => "Bitte geben Sie Ihren Nachnamen ein.",
@@ -400,7 +400,7 @@ addMessages(array(
        'EMAIL_PAYMENT' => "Mailart",
        'EMAIL_CATEGORY' => "Gebuchte Kategorie",
        'EMAIL_RECEIVERS' => "Anzahl Empf&auml;nger",
-       'EMAIL_RUIDS' => "Mitglieder-Ids",
+       'EMAIL_RUIDS' => "Mitglied-Ids",
        'EMAIL_POOL_TYPE' => "Derzeitiger Status",
        'EMAIL_TSEND' => "Noch zu sendene Mails",
        'EMAIL_URL' => "Beworbene URL",
@@ -444,7 +444,7 @@ addMessages(array(
        'MAIL_STATS_404' => "Konnte Daten aus der Statistik-Tabelle nicht laden.",
        'USER_404' => "Mitgliedsdaten nicht gefunden! Sind Sie noch angemeldet?",
        'ADMIN_UNCONFIRMED_ACCOUNTS' => "Hier alle Accounts, deren Email-Adresse nicht best&auml;tigt ist",
-       '_USERID' => "Mitglieder-Id",
+       '_USERID' => "Mitglied-Id",
        'REMOTE_IP' => "IP-Nummer",
        'REFERAL_USERID' => "Werber-Id",
        'ACCOUNT_STATUS' => "Account-Status",
@@ -718,8 +718,8 @@ addMessages(array(
        'ADMIN_CONFIG_POINT_SETTINGS_TITLE' => "Einstellungen an {?POINTS?}verg&uuml;tungen",
        'ADMIN_CONFIG_DIRECT_PAY' => "Sollen die eingestellte Anzahl an mindest zubest&auml;tigener Mails bei {?POINTS?}gutschriften ber&uuml;cksichtig werden oder immer gutgeschrieben werden?",
        'ADMIN_CHANGE_PROFILE' => "Profil &auml;ndern",
-       'ADMIN_PASS1' => "Passwort eingeben",
-       'ADMIN_PASS2' => "Passwortbest&auml;tigung",
+       'ADMIN_ENTER_PASSWORD1' => "Passwort eingeben",
+       'ADMIN_ENTER_PASSWORD2' => "Passwortbest&auml;tigung",
        'ADMIN_EDIT_USER_PROFILE' => "Editieren eines Mitgliederaccountes",
        'ADMIN_EDIT_USER_PASSWORD_NOTE' => "Geben Sie nur zweimal das Passwort ein, wenn Sie es &auml;ndern wollen. Wollen Sie nur Daten &auml;ndern, geben Sie bitte keines ein.",
        'LOCKED_POINTS' => "Noch wartende {?POINTS?}",
@@ -880,7 +880,7 @@ addMessages(array(
        'ADMIN_SELECT_REFERAL_BANNER_ACTIVE' => "Ist der Werbebanner aktiv?",
        'ADMIN_LIST_REFERALS' => "Referal-&Uuml;bersicht des Mitgliedes <span class=\"data\">{%%pipe,generateUserProfileLink=%s%%}</span> in allen Ebenen:",
        'ADMIN_LIST_REFERALS_LEVEL' => "Referals in Ebene <span class=\"data\">%s</span>:",
-       'ADMIN_LIST_REFERALS_NOTE' => "<strong>&Auml;nderung:</strong> Klicken Sie die Mitglieder-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.",
+       'ADMIN_LIST_REFERALS_NOTE' => "<strong>&Auml;nderung:</strong> Klicken Sie die Mitglied-Id an und gelangen Sie zum Mitgliederprofil. Klicken Sie Anzahl Referals an, werden die Referals des jeweiligen Mitgliedes aufgelistet.",
        'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gel&ouml;scht.",
        'INITIAL_RELEASE' => "Erstes Release fertiggestellt.",
        'DEVELOPER_RELEASE' => "Entwickler-Version zum Testen.",
@@ -978,8 +978,8 @@ addMessages(array(
 
        'ADMIN_ENTER_EMAIL' => "Geben Sie Ihre Email-Adresse ein, die Ihrem Adminlogin hinterlegt ist:",
        'ADMIN_ENTER_LOGIN' => "Bitte geben Sie Ihr Administratorlogin ein, dass Sie in der Mail erhalten haben:",
-       'ADMIN_ENTER_PASSWORD1' => "Geben Sie Ihr neues Administratorkennwort ein:",
-       'ADMIN_ENTER_PASSWORD2' => "Wiederholen Sie das Passwort zur Best&auml;tigung:",
+       'ADMIN_ENTER_NEW_PASSWORD1' => "Geben Sie Ihr neues Administratorkennwort ein:",
+       'ADMIN_ENTER_NEW_PASSWORD2' => "Wiederholen Sie das Passwort zur Best&auml;tigung:",
 
        'ADMIN_RESET_PASS' => "Ihr Administratorkennwort zur&uuml;cksetzen?",
        'ADMIN_NO_LOGIN_WITH_EMAIL' => "Kein Administrator-Account mit der angegebenen Email-Adresse gefunden.",
@@ -1039,7 +1039,7 @@ addMessages(array(
        'FATAL_EXTENSION_LOADED' => "Erweiterung <span class=\"data\">%s</span> bereits geladen.",
        'ADMIN_ACCESS_DENIED' => "Zugriff auf den Adminmen&uuml;punkt <span class=\"data\">%s</span> nicht gestattet.",
        'ADMIN_URL_BLACKLIST_DISABLED' => "URL-Sperrliste ist deaktiviert.",
-       'ADMIN_MENU_IS_EMPTY' => "Das von Ihnen ausgew&auml;hlte Men&uuml; <span class=\"data\">{%pipe,getAction%}</span> ist leer.",
+       'ADMIN_MENU_EMPTY' => "Das von Ihnen ausgew&auml;hlte Men&uuml; <span class=\"data\">{%pipe,getAction%}</span> ist leer.",
        'ADMIN_EXTENSION_TEXT_FILE_MISSING' => "Die Erweiterung <span class=\"data\">%s</span> hat keinen Beschreibungstext. Bitte melden Sie dies uns <a href=\"http://bugs.mxchange.org\" target=\"_blank\" title=\"Direkter Link zum Bug-Tracker\">im Bug-Tracker</a>.",
        'GUEST_STATS_NO_CLICKS' => "Keine Klicks in Ihrem {?mt_word?} verzeichnet.",
        'ADMIN_EXTENSIONS_REMOVED' => "Es wurden <span class=\"data\">%s</span> Erweiterungen aus Ihrem {?mt_word?} entfernt.",
diff --git a/inc/language/earning_de.php b/inc/language/earning_de.php
new file mode 100644 (file)
index 0000000..96a721c
--- /dev/null
@@ -0,0 +1,78 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/02/2011 *
+ * ===================                          Last change: 08/02/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : earning_de.php                                   *
+ * -------------------------------------------------------------------- *
+ * Short description : German langugage support                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Deutsche Sprachunterst&uuml;tzung                *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Installation/setup
+addMessages(array(
+       // Member strings
+       'MEMBER_EARNINGS_404' => "Es wurden noch keine Zusatzverdienste durch die Administratoren eingerichtet. Bitte kommen Sie sp&auml;ter hier erneut vorbei.",
+       'MEMBER_EARNING_POPUP_FORM_TITLE' => "Zusatzverdienst durch PopUps - Kategorie: {%%pipe,translateEarningName=%s%%}",
+       'MEMBER_EARNING_ENTER_DAILY_POPUP_AMOUNT' => "Wie viele PopUps wollen Sie im Login t&auml;glich maximal sehen?",
+       'MEMBER_EARNING_SUBSCRIBE_SUBMIT' => "Zusatzverdienst aktivieren",
+       'MEMBER_EARNING_DATA_MIN_POINTS' => "Mindestens verdienbar:",
+       'MEMBER_EARNING_DATA_MAX_POINTS' => "Maximal verdienbar:",
+       'MEMBER_EARNING_DATA_COUNT' => "Anzahl Verdiensteintr&auml;ge:",
+       'MEMBER_EARNING_DATA_EXCLUDE_USERID' => "Ausgeschlossene Mitgliedsnummer:",
+       'MEMBER_EARNING_DATA_GROUP' => "Gruppe Zusatzverdienst:",
+       'MEMBER_EARNING_DATA_NAME' => "Bezeichnung Zusatzverdienst:",
+       'MEMBER_EARNING_CHANGE_DAILY_POPUP_AMOUNT' => "&Auml;ndern von t&auml;glich maximal eingeblendeten PopUps:",
+       'MEMBER_EARNING_CHANGE_IS_ACTIVE' => "Zusatzverdienst aktiv?",
+       'MEMBER_EARNING_POINTS' => "Bereits erzielter Zusatzverdienst:",
+       'MEMBER_EARNING_CHANGE_SUBMIT' => "Zusatzverdienst &auml;ndern",
+
+       // Titles/notes for displaying earning data
+       'MEMBER_EARNING_TITLE' => "Zusatzverdienste bei {?MAIN_TITLE?}",
+       'MEMBER_EARNING_NOTE' => "Das Team von {?MAIN_TITLE?} w&uuml;nscht Ihnen gute Verdienste!",
+       'MEMBER_EARNING_DATA_INVALID_TITLE' => "Ung&uuml;ltigen Zusatzverdienst oder Scriptefehler!",
+       'MEMBER_EARNING_DATA_INVALID_NOTE' => "Es liegt vermutlich ein Scriptefehler vor. Bitte teilen Sie die oben stehenden Daten dem Support mit.",
+
+       // Earning groups
+       'EARNING_GROUP_INVALID' => "Ung&uuml;ltig",
+
+       // Subject lines
+       'MEMBER_EARNING_ADDED_SUBJECT' => "Zusatzverdienst hinzugef&uuml;gt",
+       'ADMIN_EARNING_INSERTED_SUBJECT' => "Mitglied hat Zusatzverdienst hinzugef&uuml;gt",
+       'MEMBER_EARNING_UPDATED_SUBJECT' => "Zusatzverdienst aktualisiert",
+       'ADMIN_EARNING_UPDATED_SUBJECT' => "Mitglied hat Zusatzverdienst aktualisiert",
+));
+
+// [EOF]
+?>
index f2f4d13..cad4041 100644 (file)
@@ -66,6 +66,9 @@ addMessages(array(
        'ADMIN_FORCED_ADS_CLICKS_COUNTER' => "Anzahl Forced-Klicks",
        'ADMIN_FORCED_ADS_HAS_FRAMEBREAKER' => "Framekiller?",
        'ADMIN_FORCED_ADS_ADDED' => "Hinzugef&uuml;gt",
+
+       // Earning names
+       'EARNING_NAME_FORCED_POPUP' => "Forced-PopUp",
 ));
 
 // [EOF]
index d9c07f2..a8d280b 100644 (file)
@@ -78,7 +78,7 @@ addMessages(array(
        'MEMBER_HOLIDAY_TIME_LOCK' => "Urlaubsschaltung eingerichtet",
        'MEMBER_HOLIDAY_LOCKED' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht wieder deaktivieren, da Sie diese erst vor Kurzem aktiviert haben.",
        'MEMBER_HOLIDAY_ORDER' => "Sie k&ouml;nnen derzeit Ihre Urlaubsschaltung nicht ver&auml;ndern, da Ihre letzte Mailbuchung zu kurz her ist! Letzte Buchung: <span class=\"data\">%s</span>",
-       'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Ihre Mitglieder-Id <span class=\"data\">{%pipe,getMemberId%}</span> wurde nicht gefunden.",
+       'MEMBER_HOLIDAY_NOT_STOPPED_404' => "Beim Beenden Ihres Urlaubes ist ein unerwarteter Fehler aufgetreten: Ihre Mitglied-Id <span class=\"data\">{%pipe,getMemberId%}</span> wurde nicht gefunden.",
 
        // Subject lines
        // - Admin
index 04a132f..4ffe2a1 100644 (file)
@@ -73,16 +73,16 @@ addMessages(array(
        'INSTALLER_TABLE_TYPE_MYISAM' => "MyISAM (langsamer, da Tabelle gelockt wird)",
        'INSTALLER_TABLE_TYPE_INNODB' => "InnoDB (schneller, da zweilenweis gelockt wird)",
        'INSTALLER_MYSQL_LOGIN' => "Ihr Loginname",
-       'INSTALLER_MYSQL_PASS1' => "Ihr Passwort",
-       'INSTALLER_MYSQL_PASS2' => "Passwortwiederholung",
+       'INSTALLER_MYSQL_PASSWORD1' => "Ihr Passwort",
+       'INSTALLER_MYSQL_PASSWORD2' => "Passwortwiederholung",
        'INSTALLER_CSS_URL' => "URL zur CSS-Datei (relativ)",
        'INSTALLER_FATAL_NO' => "Fataler Fehler im Installer Nr. #",
        'INSTALLER_FATAL_NO_MHOST' => "Sie haben keinen Hostnamen eingeben.",
        'INSTALLER_FATAL_NO_MDBASE' => "Bitte geben Sie einen Datenbankname ein.",
        'INSTALLER_FATAL_NO_MLOGIN' => "Bitte geben Sie Ihr Loginname zum Datenbank-Server ein.",
-       'INSTALLER_FATAL_NO_MPASS1' => "Sie haben kein Passwort eingegeben! Dies ist sehr unsicher und wird daher als Fehler gewertet.",
-       'INSTALLER_FATAL_NO_MPASS2' => "Bitte geben Sie noch die Passwortbest&auml;tigung ein.",
-       'INSTALLER_FATAL_MPASS1_MPASS2' => "Ihre beiden Passw&ouml;rter sind nicht identisch.",
+       'INSTALLER_FATAL_NO_MPASSWORD1' => "Sie haben kein Passwort eingegeben! Dies ist sehr unsicher und wird daher als Fehler gewertet.",
+       'INSTALLER_FATAL_NO_MPASSWORD2' => "Bitte geben Sie noch die Passwortbest&auml;tigung ein.",
+       'INSTALLER_FATAL_MPASSWORD1_MPASSWORD2' => "Ihre beiden Passw&ouml;rter sind nicht identisch.",
        'INSTALLER_OUTPUT_MODE' => "Ausgabemodus des HTML-Codes",
        'INSTALLER_MODE_RENDER' => "HTML-Code wird vom Server komplett erzeugt und dann ausgegeben",
        'INSTALLER_MODE_DIRECT' => "HTML-Code wird sofort ausgegegeben. (Langsam)",
@@ -102,11 +102,11 @@ addMessages(array(
 // SMTP input
        'INSTALLER_TEXT_SMTP_HOST' => "SMTP-Servername (z.B. mail.provider.tld)",
        'INSTALLER_TEXT_SMTP_USER' => "SMTP-Benutzername",
-       'INSTALLER_TEXT_SMTP_PASS1' => "SMTP-Kennwort",
-       'INSTALLER_TEXT_SMTP_PASS2' => "SMTP-Kennwortwiederholung",
+       'INSTALLER_TEXT_SMTP_PASSWORD1' => "SMTP-Kennwort",
+       'INSTALLER_TEXT_SMTP_PASSWORD2' => "SMTP-Kennwortwiederholung",
        'INSTALLER_SMTP_HOSTNAME_EMPTY' => "SMTP-Servername leer gelassen.",
-       'INSTALLER_SMTP_PASS1_EMPTY' => "SMTP-Passwort leer gelassen.",
-       'INSTALLER_SMTP_PASS2_EMPTY' => "SMTP-Passwortwiederholung leer gelassen.",
+       'INSTALLER_SMTP_PASSWORD1_EMPTY' => "SMTP-Passwort leer gelassen.",
+       'INSTALLER_SMTP_PASSWORD2_EMPTY' => "SMTP-Passwortwiederholung leer gelassen.",
        'INSTALLER_SMTP_PASS_MISMATCH' => "SMTP-Passwort und -wiederholung stimmen nicht &uuml;berein.",
 ));
 
index f26aee2..de7d67a 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Language definitions
 addMessages(array(
        'MEMBER_NICKNAME_CHANGE_NICKNAME_TITLE' => "Einstellen Ihres Nicknames",
-       'MEMBER_NICKNAME_CHANGE_NICKNAME_INTRO' => "Stellen Sie hier einen Nicknamen ein, der anstelle Ihrer Mitglieder-Id angezeigt wird! Dieser darf nur unten aufgef&uuml;hrte Zeichen enthalten und sollte nicht k&uuml;rzer als {?nickname_len?} Zeichen sein.",
+       'MEMBER_NICKNAME_CHANGE_NICKNAME_INTRO' => "Stellen Sie hier einen Nicknamen ein, der anstelle Ihrer Mitglied-Id angezeigt wird! Dieser darf nur unten aufgef&uuml;hrte Zeichen enthalten und sollte nicht k&uuml;rzer als {?nickname_len?} Zeichen sein.",
        'MEMBER_NICKNAME_ENTER_NICKNAME' => "Nickname eingeben",
        'MEMBER_NICKNAME_CHANGE_SUBMIT' => "Nickname &auml;ndern",
        'MEMBER_NICKNAME_ALREADY_IN_USE' => "Der von Ihnen eingegebene Nickname wird bereits verwendet.",
@@ -52,7 +52,7 @@ addMessages(array(
        'MEMBER_NICKNAME_ALLOWED_CHARS' => "Erlaubte Zeichen:",
        'MEMBER_NICKNAME_IS_INVALID' => "Ung&uuml;tige Zeichen im Nicknamen gefunden oder ist zu kurz.",
        'MEMBER_NICKNAME_YOUR_REFERAL_LINK' => "Ihr Nickname-Reflink",
-       'MEMBER_NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit k&ouml;nnen Sie sich alternativ zur Mitglieder-Id einloggen.",
+       'MEMBER_NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit k&ouml;nnen Sie sich alternativ zur Mitglied-Id einloggen.",
        'MEMBER_PLEASE_CLICK_NICKNAME_FORM' => "Hier k&ouml;nnen Sie sich nun einen einrichten...",
        'ADMIN_CONFIG_NICKNAME_TITLE' => "Einstellungen am Nicknamen",
        'ADMIN_CONFIG_NICKNAME_MIN_LENGTH' => "Minimale L&auml;nge",
index e1a8b62..da1e6c2 100644 (file)
@@ -59,7 +59,7 @@ addMessages(array(
        'MEMBER_REFBACK_EXAMPLE' => "Ein Rechenbeispiel: Ihr Referal <strong>X</strong> verdient 1.000 {?POINTS?}, es sind 10&#37; in Ref-Ebene 1 eingestellt. Ohne Refback erhalten Sie 100 {?POINTS?} in Referal-Ebene 1 gutgeschrieben. Nun haben Sie einen Refback von 90&#37; dem Referal <strong>X</strong> gegeben. Die 100 {?POINTS?} werden dann aufgeteilt: Ihrem Referal werden 90 und Ihnen die restlichen 10 von den urspr&uuml;nglichen 100 {?POINTS?} gutgeschrieben.",
        'MEMBER_REFBACK_NO_ENTRIES' => "Es gibt technische Probleme mit der Refback-Tabelle. Bitte Support benachrichtigen.",
        'MEMBER_REFBACK_EDIT_SUBMIT' => "Refback einstellen",
-       'MEMBER_REFBACK_REFID' => "Mitglieder-Id",
+       'MEMBER_REFBACK_REFID' => "Mitglied-Id",
        'MEMBER_REFBACK_LEVEL_REFID' => "Werber",
        'MEMBER_REFBACK_STATUS' => "Referal-Status",
        'MEMBER_REFBACK_PERCENTS' => "Refback-Prozente",
index 65148a6..3a281f0 100644 (file)
@@ -159,7 +159,7 @@ addMessages(array(
        'SPONSOR_DELETE_PAY_ENTRIES' => "Buchungspakete l&ouml;schen",
        'SPONSOR_PAY_ENTRIES_CHANGED' => "Buchungspakete ge&auml;ndert.",
        'SPONSOR_PAY_ENTRIES_REMOVED' => "Buchungspakete gel&ouml;scht.",
-       'SPONSOR_PAYMENT_LIST_IS_EMPTY' => "Noch keine Buchungspakete eingerichtet.",
+       'SPONSOR_PAYMENT_LIST_EMPTY' => "Noch keine Buchungspakete eingerichtet.",
        'ADMIN_SPONSOR_UNKNOWN_STATUS' => "Unbekannter Status <span class=\"data\">%s</span> wurde bei der Anmeldung zur&uuml;ckgeliefert.",
        'SPONSOR_REFERAL' => "Sponsoren-Referal",
        'SPONSOR_REFID_WAS' => "Sie wurden vom Sponsor geworben",
@@ -218,22 +218,22 @@ addMessages(array(
        'SPONSOR_SETTINGS_SUBJECT' => "HINWEIS: &Auml;nderung Ihrer Einstellungen",
 
 // Sponsor registration errors
-       'SPONSOR_SURNAME_IS_EMPTY' => "Sie haben keinen Vornamen eingegeben.",
-       'SPONSOR_FAMILY_IS_EMPTY' => "Sie haben keinen Nachnamen eingegeben.",
-       'SPONSOR_STREET_NR1_IS_EMPTY' => "Sie haben keine Stra&szlig;e eingegeben.",
-       'SPONSOR_COUNTRY_IS_EMPTY' => "Sie haben nicht den 2-stelligen L&auml;ndercode eingegeben.",
+       'SPONSOR_SURNAME_EMPTY' => "Sie haben keinen Vornamen eingegeben.",
+       'SPONSOR_FAMILY_EMPTY' => "Sie haben keinen Nachnamen eingegeben.",
+       'SPONSOR_STREET_NR1_EMPTY' => "Sie haben keine Stra&szlig;e eingegeben.",
+       'SPONSOR_COUNTRY_EMPTY' => "Sie haben nicht den 2-stelligen L&auml;ndercode eingegeben.",
        'SPONSOR_COUNTRY_IS_INVALID' => "Der von Ihnen eingegebene 2-stellige L&auml;ndercode ist nicht korrekt.",
-       'SPONSOR_ZIP_IS_EMPTY' => "Sie haben keine Postleitzahl eingegeben.",
-       'SPONSOR_CITY_IS_EMPTY' => "Sie haben keinen Wohnort/Firmensitz eingegeben.",
-       'SPONSOR_PHONE_IS_EMPTY' => "Sie haben keine Telefonnummer eingegeben.",
+       'SPONSOR_ZIP_EMPTY' => "Sie haben keine Postleitzahl eingegeben.",
+       'SPONSOR_CITY_EMPTY' => "Sie haben keinen Wohnort/Firmensitz eingegeben.",
+       'SPONSOR_PHONE_EMPTY' => "Sie haben keine Telefonnummer eingegeben.",
        'SPONSOR_URL_IS_INVALID' => "Die von Ihnen eingegebene Homepage-Adresse ist nicht korrekt.",
-       'SPONSOR_URL_IS_EMPTY' => "Sie haben keine Homepage-URL eingegeben.",
+       'SPONSOR_URL_EMPTY' => "Sie haben keine Homepage-URL eingegeben.",
        'SPONSOR_EMAIL_IS_INVALID' => "Die von Ihnen eingegebene EMail-Adresse ist nicht korrekt.",
        'SPONSOR_PASSWORD1_EMPTY' => "Sie haben kein Passwort eingegeben.",
        'SPONSOR_PASSWORD2_EMPTY' => "Sie haben keine Passwortbest&auml;tigung eingegeben.",
-       'SPONSOR_COMPANY_IS_EMPTY' => "Sie haben keine Firmennamen eingegeben.",
-       'SPONSOR_POSITION_IS_EMPTY' => "Sie haben keine Position eingegeben.",
-       'SPONSOR_TAX_IDENT_IS_EMPTY' => "Sie haben keine Ust-Ident-Nr. eingegeben.",
+       'SPONSOR_COMPANY_EMPTY' => "Sie haben keine Firmennamen eingegeben.",
+       'SPONSOR_POSITION_EMPTY' => "Sie haben keine Position eingegeben.",
+       'SPONSOR_TAX_IDENT_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>] .",
index dd35c9d..d62d67e 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Admin config strings
 addMessages(array(
        'ADMIN_CONFIG_YOOMEDIA_TITLE' => "Einstellungen f&uuml;r Yoo!Media Interface 2.0",
-       'ADMIN_CONFIG_YOOMEDIA_ID' => "Ihre Mitglieder-Id:",
+       'ADMIN_CONFIG_YOOMEDIA_ID' => "Ihre Mitglied-Id:",
        'ADMIN_CONFIG_YOOMEDIA_SID' => "Seiten-Id:",
        'ADMIN_CONFIG_YOOMEDIA_PASSWD' => "Interface-Passwort:",
        'ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD' => "Maximale Reloadzeit der Kampagnen in Stunden:",
diff --git a/inc/libs/earning_functions.php b/inc/libs/earning_functions.php
new file mode 100644 (file)
index 0000000..809fda2
--- /dev/null
@@ -0,0 +1,203 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 08/02/2011 *
+ * ===================                          Last change: 08/02/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : earning_functions.php                            *
+ * -------------------------------------------------------------------- *
+ * Short description : Functions for ext-earning                        *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Funktionen fuer ext-earning                      *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Translates the "earning group" into human-readable
+function translateEarningGroup ($earningGroup) {
+       return sprintf("{--EARNING_GROUP_%s--}", $earningGroup);
+}
+
+// Translates the "earning name" into human-readable
+function translateEarningName ($earningName) {
+       return sprintf("{--EARNING_NAME_%s--}", $earningName);
+}
+
+/*
+ * Generates a table (with templates) to display data for extra earnings (to
+ * the member) by given "earning name".
+ *
+ * @param      $earningName    Name of the earning
+ * @return     $output                 Generated HTML output
+ */
+function generateMemberEarningDataTable ($earningName) {
+       // Init array for filter
+       $filterData = array(
+               // Minimum points to get
+               'earning_min_points'     => 0,
+               // Maximum points to get
+               'earning_max_points'     => 0,
+               // Count of all entries
+               'earning_count'          => 0,
+               // -- The following arry elements are "read-only": --
+               // Exclude current userid
+               'earning_exclude_userid' => getMemberId(),
+               // "earning group"
+               'earning_group'          => 'INVALID',
+               // "earning name" again
+               'earning_name'           => $earningName
+       );
+
+       // Run the filter chain to get the data
+       $filterData = runFilterChain('member_earning_table_data', $filterData);
+
+       // Load the proper template and return it
+       $output = loadTemplate('member_earning_data_' . strtolower($filterData['earning_group']), true, $filterData);
+
+       // Return it
+       return $output;
+}
+
+// Handle earning id
+function doMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
+       // Does the user already have this earning?
+       $result = SQL_QUERY_ESC("SELECT COUNT(`id`) AS `cnt` FROM `{?_MYSQL_PREFIX?}_user_earning` WHERE `earning_id`=%s AND `earning_userid`=%s LIMIT 1",
+               array(
+                       bigintval($earningId),
+                       getMemberId()
+               ), __FUNCTION__, __LINE__);
+
+       // Get the count
+       list($count) = SQL_FETCHROW($result);
+
+       // Does the user have this?
+       if ($count == 1) {
+               // Then update it
+               $status = updateMemberEarning($earningId, $dailyAmount, $isActive);
+       } else {
+               // Not found, so add it
+               $status = insertMemberEarning($earningId, $dailyAmount, $isActive);
+       }
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return status
+       return $status;
+}
+
+// Insert member earning entry
+function insertMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
+       // Insert the record
+       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_earning` (`earning_id`,`earning_userid`,`earning_daily_amount`,`earning_active`) VALUES(%s,%s,%s,'%s')",
+               array(
+                       bigintval($earningId),
+                       getMemberId(),
+                       bigintval($dailyAmount),
+                       $isActive
+               ), __FUNCTION__, __LINE__);
+
+       // Prepare content
+       $content = array(
+               'insert_id'    => SQL_INSERTID(),
+               'earning_id'   => bigintval($earningId),
+               'daily_amount' => bigintval($dailyAmount),
+               'is_active'    => $isActive
+       );
+
+       // Load email template
+       $message = loadEmailTemplate('member_earning_added', $content, getMemberId());
+
+       // Send email out
+       sendEmail(getMemberId(), '{--MEMBER_EARNING_ADDED_SUBJECT--}', $message);
+
+       // Send admin notification
+       sendAdminNotification('{--ADMIN_EARNING_INSERTED_SUBJECT--}', 'admin_earning_added', $content, getMemberId());
+
+       // Return status
+       return ($content['insert_id'] > 0);
+}
+
+// Update a given earning amount
+function updateMemberEarning ($earningId, $dailyAmount, $isActive = 'Y') {
+       // By default the user does subscribe to an earning
+       $moreSql = '';
+
+       // Does the user cancel the earning?
+       if ($isActive == 'N') {
+               // Then update cancellation timestamp as well
+               $moreSql = ', `earning_cancelled`=NOW()';
+       } // END - if
+
+       // Update database record
+       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_earning`
+SET
+       `earning_daily_amount`=%s,
+       `earning_active`='%s'
+       " . $moreSql . "
+WHERE
+       `earning_id`=%s AND
+       `earning_userid`=%s
+LIMIT 1", array(
+               bigintval($dailyAmount),
+               $isActive,
+               bigintval($earningId),
+               getMemberId()
+       ), __FUNCTION__, __LINE__);
+
+       // Determine wether something has changed
+       $status = (!SQL_HASZEROAFFECTED());
+
+       // Has the record changed?
+       if ($status === true) {
+               // Prepare content
+               $content = array(
+                       'earning_id'   => bigintval($earningId),
+                       'daily_amount' => bigintval($dailyAmount),
+                       'is_active'    => $isActive
+               );
+
+               // Then load email template for user
+               $message = loadEmailTemplate('member_earning_updated', $content, getMemberId());
+
+               // Send email out
+               sendEmail(getMemberId(), '{--MEMBER_EARNING_UPDATED_SUBJECT--}', $message);
+
+               // Send admin notification
+               sendAdminNotification('{--ADMIN_EARNING_UPDATED_SUBJECT--}', 'admin_earning_updated', $content, getMemberId());
+       } // END - if
+
+       // Return status
+       return $status;
+}
+
+// [EOF]
+?>
index 7dac613..0717d47 100644 (file)
@@ -55,7 +55,7 @@ function doNetworkHandleForm () {
        // Was the form sent?
        if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
                // Do we have a 'do'?
-               if (isGetRequestParameterSet('do')) {
+               if (isGetRequestElementSet('do')) {
                        // Process the request
                        doAdminNetworkProcessForm();
                } else {
@@ -72,19 +72,19 @@ function doAdminNetworkProcessForm () {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
-       } elseif (!isGetRequestParameterSet('do')) {
+       } elseif (!isGetRequestElementSet('do')) {
                // No 'do' found
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
                return;
        }
 
        // Create function name
-       $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestParameter('do')));
+       $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestElement('do')));
 
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name
-               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestParameter('do') . ', function ' . $functionName .' does not exist.', false);
+               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
        } // END - if
 
        // Call-back the method handling our request
@@ -124,7 +124,7 @@ function isNetworkTypeHandleValid ($type, $networkId) {
 }
 
 // Checks wether the given network request parameter is already used (valid)
-function isNetworkRequestParameterValid ($key, $type, $networkId) {
+function isNetworkRequestElementValid ($key, $type, $networkId) {
        // Query for it
        $result = SQL_QUERY_ESC("SELECT `network_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `request_param_key`='%s' LIMIT 1",
                array($networkId, $type, $key), __FUNCTION__, __LINE__);
@@ -512,7 +512,7 @@ function generateNetworkTypeOptions ($id) {
                        '',
                        sprintf(
                                "WHERE `network_id`=%s",
-                               bigintval(getRequestParameter('network'))
+                               bigintval(getRequestElement('network'))
                        ),
                        '',
                        'translateNetworkTypeHandler'
@@ -601,7 +601,7 @@ function generateNetworkRequestKeyOptions () {
                        '',
                        '', '',
                        $GLOBALS['network_params_disabled'],
-                       'translateNetworkRequestParameter'
+                       'translateNetworkRequestElement'
                );
        } // END - if
 
@@ -684,7 +684,7 @@ function translateNetworkRequestType ($type) {
 }
 
 // Translates request parameter
-function translateNetworkRequestParameter ($param) {
+function translateNetworkRequestElement ($param) {
        // Get the message id
        return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
@@ -741,14 +741,14 @@ ORDER BY
 // Callback function to add new network
 function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
-       if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
+       if (isNetworkNameValid(postRequestElement('network_short_name'))) {
                // Already there
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestParameter('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add the whole request to database
        SQL_QUERY('INSERT INTO
@@ -760,7 +760,7 @@ function doAdminNetworkProcessAddNetwork () {
 )", __FUNCTION__, __LINE__);
 
        // Add the id for output only
-       setPostRequestParameter('network_id', SQL_INSERTID());
+       setPostRequestElement('network_id', SQL_INSERTID());
 
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
@@ -768,7 +768,7 @@ function doAdminNetworkProcessAddNetwork () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestParameter('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
        }
 }
 
@@ -778,7 +778,7 @@ function doAdminNetworkProcessHandleNetwork () {
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -826,11 +826,11 @@ function doAdminNetworkProcessHandleNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
-               $networkData = getNetworkDataById(getRequestParameter('network'));
+               $networkData = getNetworkDataById(getRequestElement('network'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -881,11 +881,11 @@ function doAdminNetworkProcessHandleRequestParams () {
                $GLOBALS['network_params_disabled'] = array();
 
                // Load network data
-               $networkData = getNetworkDataById(getRequestParameter('network'));
+               $networkData = getNetworkDataById(getRequestElement('network'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -939,7 +939,7 @@ function doAdminNetworkProcessChangeNetwork () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -984,7 +984,7 @@ function doAdminNetworkProcessRemoveNetwork () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1006,24 +1006,24 @@ function doAdminNetworkProcessRemoveNetwork () {
 // Add a network type handler if not yet found
 function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
-       if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
+       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestParameter('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Is network_type_banner_url set?
-       if (postRequestParameter('network_type_banner_url') == '') {
+       if (postRequestElement('network_type_banner_url') == '') {
                // Remove empty value to get a NULL for an optional entry
-               unsetPostRequestParameter('network_type_banner_url');
+               unsetPostRequestElement('network_type_banner_url');
        } // END - if
 
        // Add the whole request to database
@@ -1041,7 +1041,7 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestParameter('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestElement('network_type_handle') . '%}');
        }
 }
 
@@ -1053,7 +1053,7 @@ function doAdminNetworkProcessChangeNetworkType () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1104,7 +1104,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1155,7 +1155,7 @@ function doAdminNetworkProcessRemoveNetworkType () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1182,7 +1182,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1204,24 +1204,24 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 // Adds a request parameter to given network and type
 function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
-       if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
+       if (isNetworkRequestElementValid(postRequestElement('request_param_key'), postRequestElement('network_type_id'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestParameter('request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('request_param_key') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Is request_param_default set?
-       if (postRequestParameter('request_param_default') == '') {
+       if (postRequestElement('request_param_default') == '') {
                // Remove empty value to get a NULL for an optional entry
-               unsetPostRequestParameter('request_param_default');
+               unsetPostRequestElement('request_param_default');
        } // END - if
 
        // Add the whole request to database
@@ -1239,35 +1239,35 @@ function doAdminNetworkProcessAddNetworkParam () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestParameter('request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('request_param_key') . '%}');
        }
 }
 
 // Adds a API response array entry
 function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
-       if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
+       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestParameter('network_api_index') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_api_index') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Add sorting
-       setPostRequestParameter('sort', (countSumTotalData(
-               postRequestParameter('network_id'),
+       setPostRequestElement('sort', (countSumTotalData(
+               postRequestElement('network_id'),
                'network_api_translation',
                'network_api_id',
                'network_id',
                true,
-               sprintf(" AND `network_type_id`=%s", bigintval(postRequestParameter('network_type_id')))
+               sprintf(" AND `network_type_id`=%s", bigintval(postRequestElement('network_type_id')))
        ) + 1));
 
        // Add the whole request to database
@@ -1285,7 +1285,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
                loadTemplate('admin_network_api_translation_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestParameter('network_api_index') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestElement('network_api_index') . '%}');
        }
 }
 
index 1cb6390..0ed7101 100644 (file)
@@ -128,7 +128,7 @@ function insertNewsletterUrls ($text) {
 // Wrapper for sending newsletter and wrapping URLs / HTML mail
 function sendNewsletter ($to, $subject, $message, $mode) {
        // Send mail away as HTML
-       if (postRequestParameter('auto_urls') == 'Y') {
+       if (postRequestElement('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
                if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
                        // Send HTML mail
index 029519f..dff69b2 100644 (file)
@@ -237,7 +237,7 @@ class PrimeraApi {
 // is not false the API data is valid, else invalid
 function testPrimeraApi () {
        // Get new instance
-       $api = new PrimeraApi(postRequestParameter('primera_api_name'), postRequestParameter('primera_api_md5'));
+       $api = new PrimeraApi(postRequestElement('primera_api_name'), postRequestElement('primera_api_md5'));
 
        // Was that fine?
        return ($api->getPrimera() !== false);
index c768ccf..3851aa7 100644 (file)
@@ -71,18 +71,19 @@ function ifRequiredRegisterFieldsAreSet (&$array) {
 }
 
 // Generates a 'category table' for the registration form
-function registerGenerateCategoryTable ($mode, $return=false) {
+function registerGenerateCategoryTable ($mode) {
+       // Init output
        $OUT = '';
 
        // Guests are mostly not interested in how many members has
        // choosen an individual category
-       $AND = "WHERE `visible`='Y' ";
+       $whereStatement = "WHERE `visible`='Y' ";
 
        // Admins are allowed to see every category...
-       if (isAdmin()) $AND = '';
+       if (isAdmin()) $whereStatement = '';
 
        // Look for categories
-       $result = SQL_QUERY('SELECT `id`,`cat`,`visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
+       $result = SQL_QUERY('SELECT `id`,`cat`,`visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $whereStatement . ' ORDER BY `sort` ASC',
                __FUNCTION__, __LINE__);
 
        if (!SQL_HASZERONUMS($result)) {
@@ -94,7 +95,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                        $content['default_no']  = '';
 
                        // Mark categories
-                       if ((postRequestParameter('cat', $content['id']) == 'Y') || ((isRegisterDefaultEnabled()) && (!isPostRequestParameterSet('cat', $content['id'])))) {
+                       if ((postRequestElement('cat', $content['id']) == 'Y') || ((isRegisterDefaultEnabled()) && (!isPostRequestElementSet('cat', $content['id'])))) {
                                $content['default_yes'] = ' checked="checked"';
                        } else {
                                $content['default_no']  = ' checked="checked"';
@@ -112,13 +113,8 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                $OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
        }
 
-       if ($return === true) {
-               // Return generated HTML code
-               return $OUT;
-       } else {
-               // Output directly (default)
-               outputHtml($OUT);
-       }
+       // Return generated HTML code
+       return $OUT;
 }
 
 // Outputs a 'failed message'
@@ -143,25 +139,25 @@ function isRegistrationDataComplete () {
        // First we only check the submitted data then we continue... :)
        //
        // Did he agree to our Terms Of Usage?
-       if (postRequestParameter('agree') != 'Y') {
-               setPostRequestParameter('agree', '!');
+       if (postRequestElement('agree') != 'Y') {
+               setPostRequestElement('agree', '!');
                $isOkay = false;
        } // END - if
 
        // Did he enter a valid email address? (we really don't care about
        // that, he has to click on a confirmation link :P )
-       if ((!isPostRequestParameterSet('email')) || (!isEmailValid(postRequestParameter('email')))) {
-               setPostRequestParameter('email', '!');
+       if ((!isPostRequestElementSet('email')) || (!isEmailValid(postRequestElement('email')))) {
+               setPostRequestElement('email', '!');
                $isOkay = false;
        } // END - if
 
        // And what about surname and family's name?
-       if (!isPostRequestParameterSet('surname')) {
-               setPostRequestParameter('surname', '!');
+       if (!isPostRequestElementSet('surname')) {
+               setPostRequestElement('surname', '!');
                $isOkay = false;
        } // END - if
-       if (!isPostRequestParameterSet('family')) {
-               setPostRequestParameter('family', '!');
+       if (!isPostRequestElementSet('family')) {
+               setPostRequestElement('family', '!');
                $isOkay = false;
        } // END - if
 
@@ -175,19 +171,19 @@ function isRegistrationDataComplete () {
        setPostRequestArray($postArray);
 
        // Are both passwords zero length?
-       if ((strlen(postRequestParameter('pass1')) == 0) && (strlen(postRequestParameter('pass2')) == 0) && ($isOkay === true)) {
+       if ((strlen(postRequestElement('pass1')) == 0) && (strlen(postRequestElement('pass2')) == 0) && ($isOkay === true)) {
                // Is the extension 'register' newer or equal 0.5.5?
                if ((isExtensionInstalledAndNewer('register', '0.5.5')) && (isRegisterGeneratePasswordEmptyEnabled())) {
                        // Generate a random password
                        $randomPassword = generatePassword();
 
                        // Set it in both entries
-                       setPostRequestParameter('pass1', $randomPassword);
-                       setPostRequestParameter('pass2', $randomPassword);
+                       setPostRequestElement('pass1', $randomPassword);
+                       setPostRequestElement('pass2', $randomPassword);
                } else {
                        // Not allowed or no recent extension version
-                       setPostRequestParameter('pass1', '!');
-                       setPostRequestParameter('pass2', '!');
+                       setPostRequestElement('pass1', '!');
+                       setPostRequestElement('pass2', '!');
 
                        // ... which is both not okay
                        $isOkay = false;
@@ -195,35 +191,35 @@ function isRegistrationDataComplete () {
        } // END - if
 
        // Did he enter his password twice?
-       if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
-               if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
-                       setPostRequestParameter('pass1', '!');
-                       setPostRequestParameter('pass2', '!');
+       if (((!isPostRequestElementSet('pass1')) || (!isPostRequestElementSet('pass2'))) || ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')))) {
+               if ((postRequestElement('pass1') != postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2'))) {
+                       setPostRequestElement('pass1', '!');
+                       setPostRequestElement('pass2', '!');
                } else {
-                       if (!isPostRequestParameterSet('pass1')) {
-                               setPostRequestParameter('pass1', '!');
+                       if (!isPostRequestElementSet('pass1')) {
+                               setPostRequestElement('pass1', '!');
                        } else {
-                               setPostRequestParameter('pass1', '');
+                               setPostRequestElement('pass1', '');
                        }
-                       if (!isPostRequestParameterSet('pass2')) {
-                               setPostRequestParameter('pass2', '!');
+                       if (!isPostRequestElementSet('pass2')) {
+                               setPostRequestElement('pass2', '!');
                        } else {
-                               setPostRequestParameter('pass2', '');
+                               setPostRequestElement('pass2', '');
                        }
                }
                $isOkay = false;
        } // END - if
 
        // Is the password long enouth?
-       if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
+       if ((strlen(postRequestElement('pass1')) < getPassLen()) && ($isOkay === true)) {
                $GLOBALS['registration_short_password'] = true;
                $isOkay = false;
        } // END - if
 
        // Do this check only when no admin is logged in
-       if (is_array(postRequestParameter('cat'))) {
+       if (is_array(postRequestElement('cat'))) {
                // Only continue with array
-               foreach (postRequestParameter('cat') as $id => $answer) {
+               foreach (postRequestElement('cat') as $id => $answer) {
                        // Is this category choosen?
                        if ($answer == 'Y') {
                                $GLOBALS['registration_selected_cats']++;
@@ -235,10 +231,10 @@ function isRegistrationDataComplete () {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isOkay='.intval($isOkay).',selected='.$GLOBALS['registration_selected_cats'].'/'.getLeastCats());
        $isOkay = (($isOkay) && ($GLOBALS['registration_selected_cats'] >= getLeastCats()));
 
-       if ((postRequestParameter('email') != '!') && (isCheckDoubleEmailEnabled())) {
+       if ((postRequestElement('email') != '!') && (isCheckDoubleEmailEnabled())) {
                // Does the email address already exists in our database?
-               if ((isEmailTaken(postRequestParameter('email'))) && (!isAdmin())) {
-                       setPostRequestParameter('email', '?');
+               if ((isEmailTaken(postRequestElement('email'))) && (!isAdmin())) {
+                       setPostRequestElement('email', '?');
                        $isOkay = false;
                } // END - if
        } // END - if
@@ -260,8 +256,8 @@ function isRegistrationDataComplete () {
 // Do the registration
 function doRegistration () {
        // Prepapre month and day of birth
-       if (strlen(postRequestParameter('day'))   == 1) setPostRequestParameter('day'  , '0' . postRequestParameter('day'));
-       if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month'));
+       if (strlen(postRequestElement('day'))   == 1) setPostRequestElement('day'  , '0' . postRequestElement('day'));
+       if (strlen(postRequestElement('month')) == 1) setPostRequestElement('month', '0' . postRequestElement('month'));
 
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(
@@ -271,9 +267,9 @@ function doRegistration () {
                getTotalUnconfirmedUser() . getEncryptSeperator() .
                // ... and locked users!
                getTotalLockedUser() . getEncryptSeperator() .
-               postRequestParameter('month') . '-' .
-               postRequestParameter('day') . '-' .
-               postRequestParameter('year') . getEncryptSeperator() .
+               postRequestElement('month') . '-' .
+               postRequestElement('day') . '-' .
+               postRequestElement('year') . getEncryptSeperator() .
                detectServerName() . getEncryptSeperator() .
                detectRemoteAddr() . getEncryptSeperator() .
                detectUserAgent() . '/' .
@@ -284,7 +280,7 @@ function doRegistration () {
 
        // Old way with enterable two-char-code
        $countryRow = '`country`';
-       $countryData = substr(postRequestParameter('cntry'), 0, 2);
+       $countryData = substr(postRequestElement('cntry'), 0, 2);
 
        // Add design when extension ext-theme is v0.0.8 or greater
        // @TODO Rewrite these all to a single filter
@@ -314,7 +310,7 @@ function doRegistration () {
        if (isExtensionActive('country')) {
                // Save with new selectable country code
                $countryRow = '`country_code`';
-               $countryData = bigintval(postRequestParameter('country_code'));
+               $countryData = bigintval(postRequestElement('country_code'));
        } // END - if
 
        // Create user's account...
@@ -325,21 +321,21 @@ function doRegistration () {
 ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','{%%pipe,detectRemoteAddr%%}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
        array(
                $countryRow,
-               substr(postRequestParameter('gender'), 0, 1),
-               postRequestParameter('surname'),
-               postRequestParameter('family'),
-               postRequestParameter('street_nr'),
+               substr(postRequestElement('gender'), 0, 1),
+               postRequestElement('surname'),
+               postRequestElement('family'),
+               postRequestElement('street_nr'),
                $countryData,
-               bigintval(postRequestParameter('zip')),
-               postRequestParameter('city'),
-               postRequestParameter('email'),
-               bigintval(postRequestParameter('day')),
-               bigintval(postRequestParameter('month')),
-               bigintval(postRequestParameter('year')),
-               generateHash(postRequestParameter('pass1')),
-               bigintval(postRequestParameter('max_mails')),
-               bigintval(postRequestParameter('max_mails')),
-               makeZeroToNull(postRequestParameter('refid')),
+               bigintval(postRequestElement('zip')),
+               postRequestElement('city'),
+               postRequestElement('email'),
+               bigintval(postRequestElement('day')),
+               bigintval(postRequestElement('month')),
+               bigintval(postRequestElement('year')),
+               generateHash(postRequestElement('pass1')),
+               bigintval(postRequestElement('max_mails')),
+               bigintval(postRequestElement('max_mails')),
+               makeZeroToNull(postRequestElement('refid')),
                $hash
        ), __FUNCTION__, __LINE__);
 
@@ -369,8 +365,8 @@ function doRegistration () {
        addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister());
 
        // Write catgories
-       if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
-               foreach (postRequestParameter('cat') as $categoryId => $joined) {
+       if ((is_array(postRequestElement('cat'))) && (count(postRequestElement('cat')))) {
+               foreach (postRequestElement('cat') as $categoryId => $joined) {
                        if ($joined == 'Y') {
                                // Insert category entry
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s, %s)",
@@ -383,54 +379,54 @@ function doRegistration () {
        } // END - if
 
        // ... rewrite a zero referal id to the main title
-       if (!isValidUserId(postRequestParameter('refid'))) {
-               setPostRequestParameter('refid', getMainTitle());
+       if (!isValidUserId(postRequestElement('refid'))) {
+               setPostRequestElement('refid', getMainTitle());
        } // END - if
 
        // Is ZIP code set?
-       if (isPostRequestParameterSet('zip')) {
+       if (isPostRequestElementSet('zip')) {
                // Prepare data array for the email template
                // Start with the gender...
                $content = array(
                        'hash'     => $hash,
                        'userid'   => $userid,
-                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
-                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
-                       'zip'      => bigintval(postRequestParameter('zip')),
+                       'gender'   => SQL_ESCAPE(postRequestElement('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestElement('surname')),
+                       'family'   => SQL_ESCAPE(postRequestElement('family')),
+                       'email'    => SQL_ESCAPE(postRequestElement('email')),
+                       'street'   => SQL_ESCAPE(postRequestElement('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestElement('city')),
+                       'zip'      => bigintval(postRequestElement('zip')),
                        'country'  => $countryData,
-                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
-                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'refid'    => SQL_ESCAPE(postRequestElement('refid')),
+                       'password' => SQL_ESCAPE(postRequestElement('pass1')),
                );
        } else {
                // No ZIP code entered
                $content = array(
                        'hash'     => $hash,
                        'userid'   => $userid,
-                       'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
-                       'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
-                       'family'   => SQL_ESCAPE(postRequestParameter('family')),
-                       'email'    => SQL_ESCAPE(postRequestParameter('email')),
-                       'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
-                       'city'     => SQL_ESCAPE(postRequestParameter('city')),
+                       'gender'   => SQL_ESCAPE(postRequestElement('gender')),
+                       'surname'  => SQL_ESCAPE(postRequestElement('surname')),
+                       'family'   => SQL_ESCAPE(postRequestElement('family')),
+                       'email'    => SQL_ESCAPE(postRequestElement('email')),
+                       'street'   => SQL_ESCAPE(postRequestElement('street_nr')),
+                       'city'     => SQL_ESCAPE(postRequestElement('city')),
                        'zip'      => '',
                        'country'  => $countryData,
-                       'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
-                       'password' => SQL_ESCAPE(postRequestParameter('pass1')),
+                       'refid'    => SQL_ESCAPE(postRequestElement('refid')),
+                       'password' => SQL_ESCAPE(postRequestElement('pass1')),
                );
        }
 
        // Continue with birthday...
        switch (getLanguage()) {
                case 'de':
-                       $content['birthday'] = bigintval(postRequestParameter('day')) . '.' . bigintval(postRequestParameter('month')) . '.' . bigintval(postRequestParameter('year'));
+                       $content['birthday'] = bigintval(postRequestElement('day')) . '.' . bigintval(postRequestElement('month')) . '.' . bigintval(postRequestElement('year'));
                        break;
 
                default:
-                       $content['birthday'] = bigintval(postRequestParameter('month')) . '/' . bigintval(postRequestParameter('day')) . '/' . bigintval(postRequestParameter('year'));
+                       $content['birthday'] = bigintval(postRequestElement('month')) . '/' . bigintval(postRequestElement('day')) . '/' . bigintval(postRequestElement('year'));
                        break;
        } // END - switch
 
index 48fabe2..c4d10ec 100644 (file)
@@ -135,7 +135,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
 
                                // Remove last ", " from SQL string
                                $sql = substr($sql, 0, -2)." WHERE `id`=%s LIMIT 1";
-                               $DATA['values'][] = bigintval(getRequestParameter('id'));
+                               $DATA['values'][] = bigintval(getRequestElement('id'));
 
                                // Generate message
                                $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
@@ -567,7 +567,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                case 'added': // Sponsor successfully added with account status = UNCONFIRMED!
                        // Check for his id number
                        $result = SQL_QUERY_ESC("SELECT `id`,`hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE '%s' REGEXP `email` LIMIT 1",
-                               array(postRequestParameter('email')), __FUNCTION__, __LINE__);
+                               array(postRequestElement('email')), __FUNCTION__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // id found so let's load it for the confirmation email
                                list($id, $hash) = SQL_FETCHROW($result);
@@ -575,15 +575,15 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                                // Prepare data for the email template
                                $content['id']        = $id;
                                $content['hash']      = $hash;
-                               $content['email']     = postRequestParameter('email');
-                               $content['surname']   = postRequestParameter('surname');
-                               $content['family']    = postRequestParameter('family');
+                               $content['email']     = postRequestElement('email');
+                               $content['surname']   = postRequestElement('surname');
+                               $content['family']    = postRequestElement('family');
                                $content['timestamp'] = generateDateTime(time(), 0);
-                               $content['password']  = postRequestParameter('pass1');
+                               $content['password']  = postRequestElement('pass1');
 
                                // Generate email and send it to the new sponsor
                                $message = loadEmailTemplate('sponsor_confirm', $content, $id);
-                               sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message);
+                               sendEmail(postRequestElement('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJECT--}', $message);
 
                                // Send mail to admin
                                sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_reg', $content);
@@ -592,7 +592,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
                                $message = $messageArray['added'];
                        } else {
                                // Sponsor account not found???
-                               $message = '{%message,SPONSOR_EMAIL_404=' . postRequestParameter('email') . '%}';
+                               $message = '{%message,SPONSOR_EMAIL_404=' . postRequestElement('email') . '%}';
                        }
 
                        // Free memory
index 0199f56..4885858 100644 (file)
@@ -861,10 +861,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
        $templateName = 'surfbar_frameset';
 
        // Any frame set? ;-)
-       if (isGetRequestParameterSet('frame')) {
+       if (isGetRequestElementSet('frame')) {
                // Use the frame as a template name part... ;-)
                $templateName = sprintf("surfbar_frame_%s",
-                       getRequestParameter('frame')
+                       getRequestElement('frame')
                );
        } // END - if
 
index 3fc3534..ef16f11 100644 (file)
@@ -240,17 +240,17 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
                // Prepare filename for checking
-               $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
+               $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
 
                // Installation mode active
-               if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
+               if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
                        // Set cookie from URL data
-                       setTheme(getRequestParameter('theme'));
-               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestParameter('theme')))) {
+                       setTheme(getRequestElement('theme'));
+               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
                        // Set cookie from posted data
-                       setTheme(postRequestParameter('theme'));
+                       setTheme(postRequestElement('theme'));
                }
 
                // Set return value
index e4cd9e4..527ed29 100644 (file)
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 function alpha ($sortby) {
        $add = '';
        foreach (array('page','offset','mode','status') as $param) {
-               if (isGetRequestParameterSet($param)) {
-                       $add .= '&amp;' . $param . '=' . getRequestParameter($param);
+               if (isGetRequestElementSet($param)) {
+                       $add .= '&amp;' . $param . '=' . getRequestElement($param);
                } // END - if
        } // END - foreach
 
@@ -54,7 +54,7 @@ function alpha ($sortby) {
        $num = count($alphabet) - 1;
        $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
-               if (getRequestParameter('letter') == $ltr) {
+               if (getRequestElement('letter') == $ltr) {
                        // Current letter is letter from URL
                        $OUT .= '<strong>' . $ltr . '</strong>';
                } else {
@@ -84,16 +84,16 @@ function alpha ($sortby) {
 // Add links for sorting
 function addSortLinks ($letter, $sortby) {
        $OUT = '';
-       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
-       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 0);
+       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
+       if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 0);
 
        // Add page and offset
-       $add = '&amp;page=' . getRequestParameter('page') . '&amp;offset=' . getRequestParameter('offset');
+       $add = '&amp;page=' . getRequestElement('page') . '&amp;offset=' . getRequestElement('offset');
 
        // Add status/ mode
        foreach (array('mode','status') as $param) {
-               if (isGetRequestParameterSet($param)) {
-                       $add .= '&amp;' . $param . '=' . getRequestParameter($param);
+               if (isGetRequestElementSet($param)) {
+                       $add .= '&amp;' . $param . '=' . getRequestElement($param);
                } // END - if
        } // END - foreach
 
@@ -142,29 +142,29 @@ function addPageNavigation ($numPages) {
        if ($numPages > 1) {
                // Create navigation links for every page
                for ($page = 1; $page <= $numPages; $page++) {
-                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                       if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                                $OUT .= '<strong>-';
                        } else {
-                               if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
-                               if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
+                               if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', '');
+                               if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid');
 
                                // Base link
                                $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                                // Add status/mode
                                foreach (array('mode','status') as $param) {
-                                       if (isGetRequestParameterSet($param)) {
-                                               $OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
+                                       if (isGetRequestElementSet($param)) {
+                                               $OUT .= '&amp;' . $param . '=' . getRequestElement($param);
                                        } // END - if
                                } // END - foreach
 
                                // Letter and so on
-                               $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . getConfig('user_limit') . '%}">';
+                               $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . getConfig('user_limit') . '%}">';
                        }
 
                        $OUT .= $page;
 
-                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                       if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                                $OUT .= '-</strong>';
                        } else  {
                                $OUT .= '</a>';
@@ -765,12 +765,12 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
        // Do we have a 'status' or 'mode' set?
-       if (isGetRequestParameterSet('status')) {
+       if (isGetRequestElementSet('status')) {
                // Set title according to the 'status'
-               $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
-       } elseif (isGetRequestParameterSet('mode')) {
+               $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
+       } elseif (isGetRequestElementSet('mode')) {
                // Set title according to the "mode"
-               $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));
+               $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestElement('mode')));
        }
 
        // Return the code
index 9cce5ea..63d7a2b 100644 (file)
@@ -82,7 +82,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab
 }
 
 // Check if the user setups his database login stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
        outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
        if (isInstalled()) {
index 74ae2c1..5dc576e 100644 (file)
@@ -44,10 +44,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Let's start with the admins table...
-if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_instance']->extensionVersionMatches('earning'))) {
        // Load cache
        $GLOBALS['cache_array']['earning'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.5'))) {
+} elseif (isHtmlOutputMode()) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
@@ -62,7 +62,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_i
        SQL_FREERESULT($result);
 
        // Close cache
-       $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
+       $GLOBALS['cache_instance']->storeExtensionVersion('earning');
        $GLOBALS['cache_instance']->finalize();
 }
 
index b7ac0e2..e25ee43 100644 (file)
@@ -63,8 +63,8 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestParameter('DOUBLER_USERID');
-unsetPostRequestParameter('DOUBLER_USERID');
+unsetGetRequestElement('DOUBLER_USERID');
+unsetPostRequestElement('DOUBLER_USERID');
 setSession('DOUBLER_USERID', '');
 if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
index a7e7831..889af1f 100644 (file)
@@ -52,22 +52,22 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
-       if ((isFormSent()) && ((!isPostRequestParameterSet('admin_login')) || (!isPostRequestParameterSet('admin_pass1')) || (strlen(postRequestParameter('admin_pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestParameterSet('admin_pass2')) || (strlen(postRequestParameter('admin_pass2')) < getConfig('minium_admin_pass_length')) || (postRequestParameter('admin_pass1') != postRequestParameter('admin_pass2')))) {
-               setPostRequestParameter('ok', '***');
+       if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_pass1')) || (strlen(postRequestElement('admin_pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_pass2')) || (strlen(postRequestElement('admin_pass2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_pass1') != postRequestElement('admin_pass2')))) {
+               setPostRequestElement('ok', '***');
        } // END - if
 
        // Clear error message
        $errorMessage = '';
 
-       if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
+       if ((isFormSent()) && (postRequestElement('ok') != '***')) {
                // Hash the password with the old function because we are here in install mode
-               $hashedPass = md5(postRequestParameter('admin_pass1'));
+               $hashedPass = md5(postRequestElement('admin_pass1'));
 
                // Kill maybe existing session variables
                destroyAdminSession(false);
 
                // Do registration
-               $ret = addAdminAccount(postRequestParameter('admin_login'), $hashedPass, getWebmaster());
+               $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
 
                // Check if registration wents fine
                switch ($ret) {
@@ -84,7 +84,7 @@ if (!isAdminRegistered()) {
                                        $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
 
                                        // Set this to have our error message displayed
-                                       setPostRequestParameter('ok', '***');
+                                       setPostRequestElement('ok', '***');
                                }
                                break;
 
@@ -92,14 +92,14 @@ if (!isAdminRegistered()) {
                                $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
 
                                // Set this to have our error message displayed
-                               setPostRequestParameter('ok', '***');
+                               setPostRequestElement('ok', '***');
                                break;
 
                        case 'already': // Admin does already exists!
                                $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
 
                                // Set this to have our error message displayed
-                               setPostRequestParameter('ok', '***');
+                               setPostRequestElement('ok', '***');
                                break;
 
                        default:
@@ -108,7 +108,7 @@ if (!isAdminRegistered()) {
                                logDebugMessage(__FILE__, __LINE__, $errorMessage);
 
                                // Set this to have our error message displayed
-                               setPostRequestParameter('ok', '***');
+                               setPostRequestElement('ok', '***');
                                break;
                } // END - switch
        } // END - if
@@ -117,8 +117,8 @@ if (!isAdminRegistered()) {
        if ($ret != 'done') {
                // Init login name
                $content['admin_login'] = '';
-               if (isPostRequestParameterSet('admin_login')) {
-                       $content['admin_login'] = postRequestParameter('admin_login');
+               if (isPostRequestElementSet('admin_login')) {
+                       $content['admin_login'] = postRequestElement('admin_login');
                } // END - if
 
                // Init array elements
@@ -128,7 +128,7 @@ if (!isAdminRegistered()) {
                $content['error_message'] = '';
 
                // Yet-another notice-fix
-               if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
+               if ((isFormSent()) && (postRequestElement('ok') == '***')) {
                        // Init variables
                        $loginMessage = '';
                        $pass1Message = '';
@@ -145,24 +145,24 @@ if (!isAdminRegistered()) {
                        } // END - if
 
                        // No password 1 entered or to short?
-                       if (!isPostRequestParameterSet('admin_pass1')) {
-                               $pass1Message = '{--ADMIN_NO_PASS1--}';
-                       } elseif (strlen(postRequestParameter('admin_pass1')) < getConfig('minium_admin_pass_length')) {
-                               $pass1Message = '{--ADMIN_SHORT_PASS1--}';
+                       if (!isPostRequestElementSet('admin_pass1')) {
+                               $pass1Message = '{--ADMIN_NO_PASSWORD1--}';
+                       } elseif (strlen(postRequestElement('admin_pass1')) < getConfig('minium_admin_pass_length')) {
+                               $pass1Message = '{--ADMIN_SHORT_PASSWORD1--}';
                        }
 
                        // No password 2 entered or to short?
-                       if (!isPostRequestParameterSet('admin_pass2')) {
-                               $pass2Message = '{--ADMIN_NO_PASS2--}';
-                       } elseif (strlen(postRequestParameter('admin_pass2')) < getConfig('minium_admin_pass_length')) {
-                               $pass2Message = '{--ADMIN_SHORT_PASS2--}';
+                       if (!isPostRequestElementSet('admin_pass2')) {
+                               $pass2Message = '{--ADMIN_NO_PASSWORD2--}';
+                       } elseif (strlen(postRequestElement('admin_pass2')) < getConfig('minium_admin_pass_length')) {
+                               $pass2Message = '{--ADMIN_SHORT_PASSWORD2--}';
                        }
 
                        // Both didn't match?
-                       if (postRequestParameter('admin_pass1') != postRequestParameter('admin_pass2')) {
+                       if (postRequestElement('admin_pass1') != postRequestElement('admin_pass2')) {
                                // No match
-                               if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}';
-                               if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}';
+                               if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+                               if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
                        } // END - if
 
                        // Output error messages
@@ -178,24 +178,24 @@ if (!isAdminRegistered()) {
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
        } // END - if
-} elseif (isGetRequestParameterSet('reset_pass')) {
+} elseif (isGetRequestElementSet('reset_pass')) {
        // Is the form submitted?
-       if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
+       if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
                // Output result
-               displayMessage(sendAdminPasswordResetLink(postRequestParameter('email')));
-       } elseif (isGetRequestParameterSet('hash')) {
+               displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
+       } elseif (isGetRequestElementSet('hash')) {
                // Output form for hash validation
-               loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
-       } elseif ((isPostRequestParameterSet('validate_hash')) && (isPostRequestParameterSet('admin_login')) && (isPostRequestParameterSet('hash'))) {
+               loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
+       } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
                // Validate the login data and hash
-               $valid = adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('admin_login'));
+               $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
 
                // Valid?
                if ($valid === true) {
                        // Prepare content first
                        $content = array(
-                               'hash'  => postRequestParameter('hash'),
-                               'admin_login' => postRequestParameter('admin_login')
+                               'hash'        => postRequestElement('hash'),
+                               'admin_login' => postRequestElement('admin_login')
                        );
 
                        // Validation okay so display form for final password change
@@ -204,11 +204,11 @@ if (!isAdminRegistered()) {
                        // Cannot validate the login data and hash
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
                }
-       } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('admin_login')) && (isPostRequestParameterSet('admin_pass1')) && (postRequestParameter('admin_pass1') == postRequestParameter('admin_pass2'))) {
+       } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('admin_pass1')) && (postRequestElement('admin_pass1') == postRequestElement('admin_pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
-               if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('admin_login'))) {
+               if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
                        // Output result
-                       loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('admin_login'), postRequestParameter('admin_pass1')));
+                       loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
                } else {
                        // Validation failed
                        displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
@@ -224,22 +224,22 @@ if (!isAdminRegistered()) {
                redirectToUrl('modules.php?module=admin&amp;logout=1');
        } // END - if
 
-       if (isGetRequestParameterSet('register')) {
+       if (isGetRequestElementSet('register')) {
                // Registration of first admin is done
-               if (getRequestParameter('register') == 'done') {
+               if (getRequestElement('register') == 'done') {
                        // Regisration done!
                        displayMessage('{--ADMIN_REGISTER_DONE--}');
                } // END - if
        } // END - if
 
        // Check if the admin has submitted data or not
-       if ((isFormSent()) && ((!isPostRequestParameterSet('admin_login')) || (!isPostRequestParameterSet('admin_password')) || (strlen(postRequestParameter('admin_password')) < getConfig('minium_admin_pass_length')))) {
-               setPostRequestParameter('ok', '***');
+       if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password')) || (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')))) {
+               setPostRequestElement('ok', '***');
        } // END - if
 
-       if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
+       if ((isFormSent()) && (postRequestElement('ok') != '***')) {
                // All required data was entered so we check his account
-               $ret = ifAdminLoginDataIsValid(postRequestParameter('admin_login'), postRequestParameter('admin_password'));
+               $ret = ifAdminLoginDataIsValid(postRequestElement('admin_login'), postRequestElement('admin_password'));
 
                // Which status do we have?
                switch ($ret) {
@@ -257,8 +257,8 @@ if (!isAdminRegistered()) {
                                        $url .= 'what=' . getWhat();
                                } elseif (isActionSet()) {
                                        $url .= 'action=' . getAction();
-                               } elseif (isGetRequestParameterSet('area')) {
-                                       $url .= 'area=' . getRequestParameter('area');
+                               } elseif (isGetRequestElementSet('area')) {
+                                       $url .= 'area=' . getRequestElement('area');
                                }
 
                                // Load URL
@@ -266,13 +266,13 @@ if (!isAdminRegistered()) {
                                break;
 
                        case '404': // Administrator login not found
-                               setPostRequestParameter('ok', $ret);
-                               $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('admin_login') . '%}';
+                               setPostRequestElement('ok', $ret);
+                               $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}';
                                destroyAdminSession();
                                break;
 
                        case 'password': // Wrong password
-                               setPostRequestParameter('ok', $ret);
+                               setPostRequestElement('ok', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
                                break;
@@ -286,8 +286,8 @@ if (!isAdminRegistered()) {
        // Error detected?
        if ($ret != 'done') {
                $content['admin_login'] = '';
-               if (isPostRequestParameterSet('admin_login')) {
-                       $content['admin_login'] = postRequestParameter('admin_login');
+               if (isPostRequestElementSet('admin_login')) {
+                       $content['admin_login'] = postRequestElement('admin_login');
                } // END - if
 
                // Init array elements
@@ -300,22 +300,22 @@ if (!isAdminRegistered()) {
                        $passwdMessage = '';
 
                        // Check for login
-                       if (!isPostRequestParameterSet('admin_login')) {
+                       if (!isPostRequestElementSet('admin_login')) {
                                // No login entered?
                                $loginMessage = '{--ADMIN_NO_LOGIN--}';
-                       } elseif ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+                       } elseif ((!empty($ret)) && (postRequestElement('ok') == '404')) {
                                // An error comes back from login?
                                $loginMessage = $ret;
                        }
 
                        // Check for password
-                       if (!isPostRequestParameterSet('admin_password')) {
+                       if (!isPostRequestElementSet('admin_password')) {
                                // No password entered?
                                $passwdMessage = '{--ADMIN_NO_PASS--}';
-                       } elseif (strlen(postRequestParameter('admin_password')) < getConfig('minium_admin_pass_length')) {
+                       } elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
                                // Or password too short?
                                $passwdMessage = '{--ADMIN_SHORT_PASS--}';
-                       } elseif ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+                       } elseif ((!empty($ret)) && (postRequestElement('ok') == 'password')) {
                                // An error comes back from login?
                                $passwdMessage = $ret;
                        }
@@ -341,13 +341,13 @@ if (!isAdminRegistered()) {
                                // Set default values
                                $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
                        }
-               } elseif (isGetRequestParameterSet('area')) {
+               } elseif (isGetRequestElementSet('area')) {
                        // Restore old area value
                        $content = merge_array(
                                $content,
                                array(
                                        'target' => 'area',
-                                       'value'  => getRequestParameter('area')
+                                       'value'  => getRequestElement('area')
                                )
                        );
                } else {
@@ -358,19 +358,19 @@ if (!isAdminRegistered()) {
                // Load login form template
                loadTemplate('admin_login_form', false, $content);
        } // END - if
-} elseif (isGetRequestParameterSet('logout')) {
+} elseif (isGetRequestElementSet('logout')) {
        // Only try to remove cookies
        if (destroyAdminSession()) {
                // Load logout template
-               if (isGetRequestParameterSet('register')) {
+               if (isGetRequestElementSet('register')) {
                        // Secure input
-                       $register = getRequestParameter('register');
+                       $register = getRequestElement('register');
 
                        // Special logout redirect for installation of given extension
                        loadTemplate(sprintf("admin_logout_%s_install", $register));
-               } elseif (isGetRequestParameterSet('remove')) {
+               } elseif (isGetRequestElementSet('remove')) {
                        // Secure input
-                       $remove = getRequestParameter('remove');
+                       $remove = getRequestElement('remove');
 
                        // Special logout redirect for removal of given extension
                        loadTemplate(sprintf("admin_logout_%s_remove", $remove));
@@ -401,7 +401,7 @@ if (!isAdminRegistered()) {
                                $area = 'entrance';
 
                                // Check for similar URL variable
-                               if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
+                               if (isGetRequestElementSet('area')) $area = getRequestElement('area');
 
                                // Load logical-area menu-system file
                                loadIncludeOnce('inc/modules/admin/lasys-inc.php');
@@ -416,13 +416,13 @@ if (!isAdminRegistered()) {
                        break;
 
                case '404': // Administrator login not found
-                       setPostRequestParameter('ok', $ret);
+                       setPostRequestElement('ok', $ret);
                        displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
                        destroyAdminSession();
                        break;
 
                case 'password': // Wrong password
-                       setPostRequestParameter('ok', $ret);
+                       setPostRequestElement('ok', $ret);
                        displayMessage('{--WRONG_PASS--}');
                        destroyAdminSession();
                        break;
index 17e3e35..fa1d048 100644 (file)
@@ -43,10 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (isPostRequestParameterSet('no')) {
+if (isPostRequestElementSet('no')) {
        // Do not logout now
        redirectToUrl('admin.php');
-} elseif ((isPostRequestParameterSet('yes')) && (getAction() == 'logout')) {
+} elseif ((isPostRequestElementSet('yes')) && (getAction() == 'logout')) {
        // Redirect to logout link
        redirectToUrl('modules.php?module=admin&amp;logout=1');
 }
index 850cc85..21f8bb2 100644 (file)
@@ -771,7 +771,7 @@ function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '
        } // END - if
 
        // Is the raw userid set?
-       if (postRequestParameter($userIdColumn[0], $id) > 0) {
+       if (postRequestElement($userIdColumn[0], $id) > 0) {
                // Load email template
                if (!empty($subjectPart)) {
                        $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
@@ -780,7 +780,7 @@ function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '
                }
 
                // Send email out
-               sendEmail(postRequestParameter($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
+               sendEmail(postRequestElement($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
        } // END - if
 
        // Generate subject
@@ -788,9 +788,9 @@ function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '
 
        // Send admin notification out
        if (!empty($subjectPart)) {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestParameter($userIdColumn[0], $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
        } else {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestParameter($userIdColumn[0], $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
        }
 }
 
@@ -813,7 +813,7 @@ function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $e
 
        // "Walk" through all entries
        //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'listType=<pre>'.print_r($listType,true).'</pre>,tableName<pre>'.print_r($tableName,true).'</pre>,columns=<pre>'.print_r($columns,true).'</pre>,filterFunctions=<pre>'.print_r($filterFunctions,true).'</pre>,extraValues=<pre>'.print_r($extraValues,true).'</pre>,idColumn=<pre>'.print_r($idColumn,true).'</pre>,userIdColumn=<pre>'.print_r($userIdColumn,true).'</pre>,rawUserId=<pre>'.print_r($rawUserId,true).'</pre>');
-       foreach (postRequestParameter($idColumn[0]) as $id => $selected) {
+       foreach (postRequestElement($idColumn[0]) as $id => $selected) {
                // Secure id number
                $id = bigintval($id);
 
@@ -892,7 +892,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
        // All valid entries? (We hope so here!)
        if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
                // "Walk" through all entries
-               foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
+               foreach (postRequestElement($idColumn[0]) as $id => $sel) {
                        // Construct SQL query
                        $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
 
@@ -1006,9 +1006,9 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 
                        // Delete them all
                        $idList = '';
-                       foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
+                       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
                                // Is there a userid?
-                               if (isPostRequestParameterSet($rawUserId[0], $id)) {
+                               if (isPostRequestElementSet($rawUserId[0], $id)) {
                                        // Load all data from that id
                                        $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
                                                array(
@@ -1035,12 +1035,12 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
                        SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
 
                        // Was this fine?
-                       if (SQL_AFFECTEDROWS() == count(postRequestParameter($idColumn[0]))) {
+                       if (SQL_AFFECTEDROWS() == count(postRequestElement($idColumn[0]))) {
                                // All deleted
                                displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
                        } else {
                                // Some are still there :(
-                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count(postRequestParameter($idColumn[0]))));
+                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count(postRequestElement($idColumn[0]))));
                        }
                } else {
                        // List for deletion confirmation
@@ -1073,7 +1073,7 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
                if ($editNow[0] === true) {
                        // Change them all
                        $affected = '0';
-                       foreach (postRequestParameter($idColumn[0]) as $id => $sel) {
+                       foreach (postRequestElement($idColumn[0]) as $id => $sel) {
                                // Prepare content array (new values)
                                $content = array();
 
@@ -1144,12 +1144,12 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
                        } // END - foreach
 
                        // Was this fine?
-                       if ($affected == count(postRequestParameter($idColumn[0]))) {
+                       if ($affected == count(postRequestElement($idColumn[0]))) {
                                // All deleted
                                displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
                        } else {
                                // Some are still there :(
-                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count(postRequestParameter($idColumn[0]))));
+                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count(postRequestElement($idColumn[0]))));
                        }
                } else {
                        // List for editing
@@ -1235,7 +1235,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
        foreach ($columns as $key=>$columnName) {
                // Copy entry to final arrays
                $sqlColumns[$key] = $columnName;
-               $sqlValues[$key]  = postRequestParameter($columnName);
+               $sqlValues[$key]  = postRequestElement($columnName);
                //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key='.$key.',columnName='.$columnName.',filterFunctions='.$filterFunctions[$key].',extraValues='.intval(isset($extraValues[$key])).',extraValuesName='.intval(isset($extraValues[$columnName . '_list'])).'<br />');
 
                // Send data through the filter function if found
@@ -1614,7 +1614,7 @@ function doVerifyExpertSettings () {
                                // Ask for them
                                if (isFormSent()) {
                                        // Is the element set, then we need to change the admin
-                                       if (isPostRequestParameterSet('expert_settings')) {
+                                       if (isPostRequestElementSet('expert_settings')) {
                                                // Get it and prepare final post data array
                                                $postData['login'][getCurrentAdminId()] = getCurrentAdminLogin();
                                                $postData['expert_warning'][getCurrentAdminId()] = 'N';
@@ -1623,7 +1623,7 @@ function doVerifyExpertSettings () {
                                                adminsChangeAdminAccount($postData, 'expert_warning');
 
                                                // Clear form
-                                               unsetPostRequestParameter('ok');
+                                               unsetPostRequestElement('ok');
                                        } // END - if
 
                                        // All fine!
@@ -1689,7 +1689,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
        $NAV = '';
        for ($page = 1; $page <= $numPages; $page++) {
                // Is the page currently selected or shall we generate a link to it?
-               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '<strong>-';
                } else {
@@ -1697,13 +1697,13 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
                        $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 ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+                       if ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
                        // Close open anchor tag
                        $NAV .= '%}">';
                }
                $NAV .= $page;
-               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '-</strong>';
                } else {
@@ -1738,7 +1738,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 // Process menu editing form
 function adminProcessMenuEditForm ($type, $subMenu) {
        // An action is done...
-       foreach (postRequestParameter('sel') as $sel => $menu) {
+       foreach (postRequestElement('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
 
                $sel = bigintval($sel);
@@ -1747,15 +1747,15 @@ function adminProcessMenuEditForm ($type, $subMenu) {
                        $AND = "`action`='" . $subMenu . "'";
                } // END - if
 
-               switch (postRequestParameter('ok')) {
+               switch (postRequestElement('ok')) {
                        case 'edit': // Edit menu
-                               if (postRequestParameter('sel_what', $sel) == '') {
+                               if (postRequestElement('sel_what', $sel) == '') {
                                        // Update with 'what'=null
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
-                                                       postRequestParameter('sel_action', $sel),
+                                                       postRequestElement('sel_action', $sel),
                                                        $sel
                                                ), __FILE__, __LINE__);
                                } else {
@@ -1764,8 +1764,8 @@ function adminProcessMenuEditForm ($type, $subMenu) {
                                                array(
                                                        $type,
                                                        $menu,
-                                                       postRequestParameter('sel_action', $sel),
-                                                       postRequestParameter('sel_what', $sel),
+                                                       postRequestElement('sel_action', $sel),
+                                                       postRequestElement('sel_what', $sel),
                                                        $sel
                                                ), __FILE__, __LINE__);
                                }
@@ -1778,12 +1778,12 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
                        case 'status': // Change status of menus
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-                                       array($type, postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+                                       array($type, postRequestElement('visible', $sel), postRequestElement('locked', $sel), $sel), __FILE__, __LINE__);
                                break;
 
                        default: // Unexpected action
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
+                               logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
                                break;
                } // END - switch
        } // END - foreach
@@ -1795,26 +1795,26 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 // Handle weightning
 function doAdminProcessMenuWeightning ($type, $AND) {
        // Are there all required (generalized) GET parameter?
-       if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
+       if ((isGetRequestElementSet('act')) && (isGetRequestElementSet('tid')) && (isGetRequestElementSet('fid'))) {
                // Init variables
                $tid = ''; $fid = '';
 
                // Get ids
-               if (isGetRequestParameterSet('w')) {
+               if (isGetRequestElementSet('w')) {
                        // Sub menus selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       getRequestParameter('act'),
-                                       bigintval(getRequestParameter('tid'))
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('tid'))
                                ), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       getRequestParameter('act'),
-                                       bigintval(getRequestParameter('fid'))
+                                       getRequestElement('act'),
+                                       bigintval(getRequestElement('fid'))
                                ), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
@@ -1823,14 +1823,14 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('tid'))
+                                       bigintval(getRequestElement('tid'))
                                ), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('fid'))
+                                       bigintval(getRequestElement('fid'))
                                ), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
@@ -1841,13 +1841,13 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('tid')),
+                                       bigintval(getRequestElement('tid')),
                                        bigintval($fid)
                                ), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
-                                       bigintval(getRequestParameter('fid')),
+                                       bigintval(getRequestElement('fid')),
                                        bigintval($tid)
                                ), __FILE__, __LINE__);
                } // END - if
index 3ab1385..3afba09 100644 (file)
@@ -43,11 +43,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (getRequestParameter('userid') == 'all') {
+if (getRequestElement('userid') == 'all') {
        // Add points to all accounts
-       if ((isFormSent()) && (postRequestParameter('points') > 0)) {
+       if ((isFormSent()) && (postRequestElement('points') > 0)) {
                // Points
-               $content['points'] = bigintval(postRequestParameter('points'));
+               $content['points'] = bigintval(postRequestElement('points'));
 
                // Select all users
                $result_main = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
@@ -64,12 +64,12 @@ if (getRequestParameter('userid') == 'all') {
                        $GLOBALS['ref_level'] = -1;
 
                        // Ok, add points and send an email to him...
-                       addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestParameter('points')));
+                       addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestElement('points')));
 
                        // Prepare content
                        $content = array(
-                               'reason' => SQL_ESCAPE(postRequestParameter('reason')),
-                               'points' => bigintval(postRequestParameter('points')),
+                               'reason' => SQL_ESCAPE(postRequestElement('reason')),
+                               'points' => bigintval(postRequestElement('points')),
                                'userid' => $row['userid']
                        );
 
@@ -87,37 +87,37 @@ if (getRequestParameter('userid') == 'all') {
                // Display form add points
                loadTemplate('admin_add_points_all');
        }
-} elseif (isGetRequestParameterSet('userid')) {
+} elseif (isGetRequestElementSet('userid')) {
        // User id found in URL so we use this give him some credits
-       if (fetchUserData(getRequestParameter('userid'))) {
+       if (fetchUserData(getRequestElement('userid'))) {
                // Selected user does exist
                $content = getUserDataArray();
 
-               if ((isFormSent()) && (isPostRequestParameterSet('points'))) {
+               if ((isFormSent()) && (isPostRequestElementSet('points'))) {
                        // Add points and send an email to him...
-                       addPointsDirectly('admin_single', bigintval(getRequestParameter('userid')), bigintval(postRequestParameter('points')));
+                       addPointsDirectly('admin_single', bigintval(getRequestElement('userid')), bigintval(postRequestElement('points')));
 
                        // Prepare content
                        $content = array(
-                               'reason' => SQL_ESCAPE(postRequestParameter('reason')),
-                               'points' => bigintval(postRequestParameter('points'))
+                               'reason' => SQL_ESCAPE(postRequestElement('reason')),
+                               'points' => bigintval(postRequestElement('points'))
                        );
 
                        // Message laden
-                       $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestParameter('userid')));
+                       $message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestElement('userid')));
 
-                       sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
+                       sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
                        displayMessage('{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content
-                       $content['userid'] = bigintval(getRequestParameter('userid'));
+                       $content['userid'] = bigintval(getRequestElement('userid'));
 
                        // Output template
                        loadTemplate('admin_add_points', false, $content);
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed
index aafcac4..8286c6e 100644 (file)
@@ -45,8 +45,8 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
        // Generate timestamps
-       $START = mktime(postRequestParameter('start_hour'), postRequestParameter('start_min'), postRequestParameter('start_sec'), postRequestParameter('start_month'), postRequestParameter('start_day'), postRequestParameter('start_year'));
-       $END   = mktime(postRequestParameter('end_hour')  , postRequestParameter('end_min')  , postRequestParameter('end_sec')  , postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
+       $START = mktime(postRequestElement('start_hour'), postRequestElement('start_min'), postRequestElement('start_sec'), postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
+       $END   = mktime(postRequestElement('end_hour')  , postRequestElement('end_min')  , postRequestElement('end_sec')  , postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
 
        // Is there already a rallye running?
        $result = SQL_QUERY_ESC("SELECT `id`,`admin_id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE (`start_time` <= %s AND `end_time` >= %s) OR (`start_time` >= %s AND `start_time` <= %s) LIMIT 1",
@@ -58,14 +58,14 @@ if (isFormSent()) {
 VALUES (%s,'%s','%s','%s',%s,%s,'%s','%s','%s')",
                        array(
                                getCurrentAdminId(),
-                               postRequestParameter('title'),
-                               postRequestParameter('descr'),
-                               postRequestParameter('template'),
+                               postRequestElement('title'),
+                               postRequestElement('descr'),
+                               postRequestElement('template'),
                                $START,
                                $END,
-                               postRequestParameter('auto_add'),
-                               postRequestParameter('active'),
-                               postRequestParameter('notify'),
+                               postRequestElement('auto_add'),
+                               postRequestElement('active'),
+                               postRequestElement('notify'),
                        ), __FILE__, __LINE__);
 
                // Load id
index 1df5256..ed671d7 100644 (file)
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Was an URL added?
-if ((isFormSent('add')) && (isPostRequestParameterSet('url'))) {
+if ((isFormSent('add')) && (isPostRequestElementSet('url'))) {
        // Initialize variables
        $content = array();
        $id = 'reload_ye';
@@ -52,7 +52,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('url'))) {
        $postData = postRequestArray();
 
        // Convert the "reload selections"
-       // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestParameter() calls to $postData
+       // @TODO Find all convertSelectionsToEpocheTime() calls and rewrite postRequestElement() calls to $postData
        convertSelectionsToEpocheTime($postData, $content, $id, $skip);
 
        // Then add this URL
index 8363be5..21d3273 100644 (file)
@@ -44,8 +44,8 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if ((isFormSent()) && ((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet('descr')))) {
-       unsetPostRequestParameter('ok');
+if ((isFormSent()) && ((!isPostRequestElementSet('title')) || (!isPostRequestElementSet('menu')) || (!isPostRequestElementSet('descr')))) {
+       unsetPostRequestElement('ok');
 } // END - if
 
 if (!isFormSent()) {
@@ -161,25 +161,25 @@ if (!isFormSent()) {
        loadTemplate('admin_add_admin_menu', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
-       if (isPostRequestParameterSet('menu')) {
+       if (isPostRequestElementSet('menu')) {
                // Add sub menu
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
                        array(
-                               postRequestParameter('menu'),
-                               postRequestParameter('name'),
-                               postRequestParameter('title'),
-                               postRequestParameter('descr'),
-                               bigintval(postRequestParameter('sort')),
+                               postRequestElement('menu'),
+                               postRequestElement('name'),
+                               postRequestElement('title'),
+                               postRequestElement('descr'),
+                               bigintval(postRequestElement('sort')),
                        ), __FILE__, __LINE__
                );
        } else {
                // Add main menu
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
                        array(
-                               postRequestParameter('name'),
-                               postRequestParameter('title'),
-                               postRequestParameter('descr'),
-                               bigintval(postRequestParameter('sort')),
+                               postRequestElement('name'),
+                               postRequestElement('title'),
+                               postRequestElement('descr'),
+                               bigintval(postRequestElement('sort')),
                        ), __FILE__, __LINE__
                );
        }
index d418ba4..a40d0a5 100644 (file)
@@ -45,9 +45,9 @@ addYouAreHereLink('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $subMenu = '';
-if (isGetRequestParameterSet('sub')) {
-       $AND = sprintf("`action`='%s' AND `what` != '' AND `what` IS NOT NULL", getRequestParameter('sub'));
-       $subMenu = getRequestParameter('sub');
+if (isGetRequestElementSet('sub')) {
+       $AND = sprintf("`action`='%s' AND `what` != '' AND `what` IS NOT NULL", getRequestElement('sub'));
+       $subMenu = getRequestElement('sub');
 } // END - if
 
 // List all menu points and make them editable
@@ -57,7 +57,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['sub'] = $subMenu;
        $content['chk'] = countPostSelection();
        $count = '0'; $OUT = '';
-       foreach (postRequestParameter('sel') as $sel => $confirm) {
+       foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $count++;
                        $result = SQL_QUERY_ESC("SELECT `title`,`action`,`what`,`descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -107,7 +107,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 
        // Del menu entries with or without confirmation
        $count = '0'; $OUT = '';
-       foreach (postRequestParameter('sel') as $sel => $confirm) {
+       foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $count++;
                        $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -143,9 +143,9 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        loadTemplate('admin_delete_admin_menu', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
-       switch (postRequestParameter('ok')) {
+       switch (postRequestElement('ok')) {
                case 'edit': // Edit menu
-                       foreach (postRequestParameter('sel') as $sel => $menu) {
+                       foreach (postRequestElement('sel') as $sel => $menu) {
                                // Secure id
                                $sel = bigintval($sel);
 
@@ -163,9 +163,9 @@ WHERE
 LIMIT 1",
                                array(
                                        $menu,
-                                       postRequestParameter('sel_action', $sel),
-                                       postRequestParameter('sel_what', $sel),
-                                       postRequestParameter('sel_desc', $sel),
+                                       postRequestElement('sel_action', $sel),
+                                       postRequestElement('sel_what', $sel),
+                                       postRequestElement('sel_desc', $sel),
                                        $sel,
                                ), __FILE__, __LINE__);
                        }
@@ -175,7 +175,7 @@ LIMIT 1",
                        break;
 
                case 'delete': // Delete menu
-                       foreach (postRequestParameter('sel') as $sel => $menu) {
+                       foreach (postRequestElement('sel') as $sel => $menu) {
                                SQL_QUERY_ESC("DELET