fooRequestElementBar() functions renamed, adding of request parameters added:
authorRoland Häder <roland@mxchange.org>
Thu, 26 Nov 2009 21:16:15 +0000 (21:16 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 26 Nov 2009 21:16:15 +0000 (21:16 +0000)
- All fooRequestElementBar() functions are now renamed to fooRequestParameterBar()
- Adding of network request parameters basicly added, once a parameter has been
  added the added parameter is disabled in HTML and the choosen network type
  handler is pre-choosen.
- Documentation updated

164 files changed:
.gitattributes
DOCS/de/network/README.txt
beg.php
birthday_confirm.php
click.php
confirm.php
debug.php
doubler.php
img.php
inc/extensions/ext-network.php
inc/filters.php
inc/functions.php
inc/header.php
inc/install-functions.php
inc/install-inc.php
inc/js/js-surfbar_member_edit.php
inc/js/js-surfbar_stopped.php
inc/language-functions.php
inc/language/network_de.php
inc/libs/bonus_functions.php
inc/libs/network_functions.php
inc/libs/newsletter_functions.php
inc/libs/other_functions.php
inc/libs/politician_stop_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/uberwach_functions.php
inc/libs/user_functions.php
inc/load_config.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_admins.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_doubler.php
inc/modules/admin/what-config_email.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_sponsor.php
inc/modules/admin/what-config_surfbar.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_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_doubler.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_network_params.php
inc/modules/admin/what-list_network_types.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-payments.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-send_bonus.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-categories.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.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-surfbar_book.php
inc/modules/member/what-surfbar_list.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/request-functions.php
inc/stylesheet.php
inc/wrapper-functions.php
install.php
js.php
mailid.php
mailid_top.php
modules.php
show_bonus.php
sponsor_confirm.php
surfbar.php
templates/de/html/admin/admin_add_network_params.tpl
templates/de/html/admin/admin_list_network_params.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_network_params_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_network_request_param_added.tpl [new file with mode: 0644]
view.php

index 6877e65..6965d27 100644 (file)
@@ -1082,6 +1082,8 @@ templates/de/html/admin/admin_list_links_problem.tpl -text
 templates/de/html/admin/admin_list_links_row.tpl -text
 templates/de/html/admin/admin_list_mods.tpl -text
 templates/de/html/admin/admin_list_mods_row.tpl -text
+templates/de/html/admin/admin_list_network_params.tpl -text
+templates/de/html/admin/admin_list_network_params_row.tpl -text
 templates/de/html/admin/admin_list_network_types.tpl -text
 templates/de/html/admin/admin_list_network_types_row.tpl -text
 templates/de/html/admin/admin_list_networks.tpl -text
@@ -1181,6 +1183,7 @@ templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
 templates/de/html/admin/admin_network_added.tpl -text
+templates/de/html/admin/admin_network_request_param_added.tpl -text
 templates/de/html/admin/admin_network_type_added.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
index 00e1a51..cac1d42 100644 (file)
@@ -1,7 +1,7 @@
 Verwendbar Platzhalter fuer URLs:
 ---------------------------------
 
-ID = Ihre Werbenetz-Id (meistens die Sie zum Einloggen verwenden)
+ID  = Ihre Werbenetz-Id (meistens die Sie zum Einloggen verwenden)
 SID = Die Seiten-Id Ihrer Eingetragen Webseite
 BID = Banner-Id (z.B. Forcedbanner oder Bannerklick/-view)
 
@@ -9,3 +9,15 @@ Diese Platzhalter muessen in Prozenten eingeschlossen in die URL eingebunden sei
 
 Beispiel:
 http://www.anbieter-name.invalid/code/t-mail.php?id=%ID%&sid=%SID%
+
+-------------------------------------------------------------------------------
+
+Verwendete Abfrageparameter:
+----------------------------
+id       = Kundennummer (Merchant-Id oder Account-Id)
+password = Interface-Passwort (nicht Account-Passwort)
+reload   = Maximale Reloadsperre in Sekunden (!) nach der gesucht werden soll
+remain   = Mindestanzahl an Klicks nach der gesucht werden soll
+reward   = Mindestverguetung nach der gesucht werden soll
+size     = Groesse des Werbemittels (bei Bannern, Buttons, evtl. Popup/-down)
+erotic   = Ob Erotik-Kampagnen erlaubt oder nicht, oder exklusiv Erotik-Kampagnen holen
diff --git a/beg.php b/beg.php
index 072f4b4..2aabc5c 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -57,7 +57,7 @@ setContentType('text/html');
 redirectOnUninstalledExtension('beg');
 
 // Check for userid
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
        // Init variables
        $points = '0';
 
@@ -65,18 +65,18 @@ if (isGetRequestElementSet('userid')) {
        $pay = false;
 
        // Validate if it is not a number
-       if (isNicknameUsed(getRequestElement('userid'))) {
+       if (isNicknameUsed(getRequestParameter('userid'))) {
                // Is the nickname extension there?
                if (isExtensionActive('nickname')) {
                        // Maybe we have found a nickname?
-                       fetchUserData(getRequestElement('userid'), 'nickname');
+                       fetchUserData(getRequestParameter('userid'), 'nickname');
                } else {
                        // Nickname entered but nickname is not active
                        $errorCode = getCode('EXTENSION_PROBLEM');
                }
        } else {
                // Direct userid
-               fetchUserData(getRequestElement('userid'));
+               fetchUserData(getRequestParameter('userid'));
        }
 
        // Check if locked in so don't pay points
@@ -90,7 +90,7 @@ if (isGetRequestElementSet('userid')) {
                $points = mt_rand((getConfig('beg_points') * 100000), (getConfig('beg_points_max') * 100000)) / 100000;
 
                // Set nickname / userid for template
-               $content['userid']      = getRequestElement('userid');
+               $content['userid']      = getRequestParameter('userid');
                $content['clicks']      = (getUserData('beg_clicks') + 1);
                $content['banner']      = loadTemplate('beg_banner', true);
                $content['points']      = translateComma($points);
@@ -187,7 +187,7 @@ if (isGetRequestElementSet('userid')) {
                $errorCode = generateErrorCodeFromUserStatus();
        } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) {
                // Inalid or locked account, so let's find out
-               if (fetchUserData(getRequestElement('userid'), 'nickname')) {
+               if (fetchUserData(getRequestParameter('userid'), 'nickname')) {
                        // Locked account
                        $errorCode = getCode('ACCOUNT_LOCKED');
                } else {
index 2f1aedc..c228c94 100644 (file)
@@ -56,10 +56,10 @@ setContentType('text/html');
 redirectOnUninstalledExtension('birthday');
 
 // Script is installed so let's check for his confirmation link...
-$userid = bigintval(getRequestElement('userid'));
+$userid = bigintval(getRequestParameter('userid'));
 
 // Only allow numbers here...
-$chk = bigintval(getRequestElement('check'), false);
+$chk = bigintval(getRequestParameter('check'), false);
 
 // Check if link is not clicked so far
 $result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
@@ -73,7 +73,7 @@ WHERE
        b.userid=%s AND b.chk_value='%s'
 LIMIT 1",
        array($userid, $chk), __FILE__, __LINE__);
-//* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestElement('check')).'/'.SQL_NUMROWS($result).")<br />");
+//* DEBUG: */ outputHtml("userid=".$userid.",chk=".$chk." (".strlen($chk).'/'.strlen(getRequestParameter('check')).'/'.SQL_NUMROWS($result).")<br />");
 
 // Prepare content
 $content = array();
index 703caf6..8595076 100644 (file)
--- a/click.php
+++ b/click.php
@@ -50,16 +50,16 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Check required parameters
-if (((isGetRequestElementSet('user')) || (isGetRequestElementSet('reseller'))) && (isGetRequestElementSet('banner'))) {
+if (((isGetRequestParameterSet('user')) || (isGetRequestParameterSet('reseller'))) && (isGetRequestParameterSet('banner'))) {
        // Update clicks counter...
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1", array(bigintval(getRequestElement('banner'))), __FILE__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1", array(bigintval(getRequestParameter('banner'))), __FILE__, __LINE__);
 
        // A line has been updated?
        if (SQL_AFFECTEDROWS() == 1) {
-               if (isGetRequestElementSet('user')) {
-                       redirectToUrl('ref.php?refid=' . bigintval(getRequestElement('user')));
-               } elseif (isGetRequestElementSet('reseller')) {
-                       redirectToUrl('shop_reseller.php?reseller=' . bigintval(getRequestElement('reseller')));
+               if (isGetRequestParameterSet('user')) {
+                       redirectToUrl('ref.php?refid=' . bigintval(getRequestParameter('user')));
+               } elseif (isGetRequestParameterSet('reseller')) {
+                       redirectToUrl('shop_reseller.php?reseller=' . bigintval(getRequestParameter('reseller')));
                }
        } // END - if
 } // END - if
index 4f30d2f..b413408 100644 (file)
@@ -53,9 +53,9 @@ if (isSpider()) setContentType('text/html');
 $URL = 'modules.php?module=index';
 
 // Is the hash there?
-if (isGetRequestElementSet('hash')) {
+if (isGetRequestParameterSet('hash')) {
        // We have an refid here. So we simply add it
-       $URL = 'modules.php?module=index&amp;what=confirm&amp;hash=' . getRequestElement('hash');
+       $URL = 'modules.php?module=index&amp;what=confirm&amp;hash=' . getRequestParameter('hash');
 } // END - if
 
 // Load the URL
index f9fec82..af43626 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -49,13 +49,13 @@ require('inc/config-global.php');
 // Redirect only to registration page when this script is installed
 if ((isExtensionActive('debug')) && (getTotalFatalErrors() == '0')) {
        // Is the request parameter set?
-       if (isPostRequestElementSet('request')) {
+       if (isPostRequestParameterSet('request')) {
                // Handle the request
-               if (DEBUG_HANDLE_REQUEST(postRequestElement('request'))) {
+               if (DEBUG_HANDLE_REQUEST(postRequestParameter('request'))) {
                        // Construct FQFN for the module
                        $inc = sprintf("inc/debug/%s/request_%s",
                                getConfig('debug_mode'),
-                               SQL_ESCAPE(postRequestElement('request'))
+                               SQL_ESCAPE(postRequestParameter('request'))
                        );
 
                        // Is the module there? Else we log it!
@@ -64,11 +64,11 @@ if ((isExtensionActive('debug')) && (getTotalFatalErrors() == '0')) {
                                loadInclude($inc);
                        } else {
                                // Missing request files may happen while development
-                               DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestElement('request'));
+                               DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_404', postRequestParameter('request'));
                        }
                } else {
                        // Unhandled request detected
-                       DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_unhandled', postRequestElement('request'));
+                       DEBUG_ABUSE_LOG(__FILE__, __LINE__, 'request_unhandled', postRequestParameter('request'));
                }
        } else {
                // Empty request
index 34668ed..593f796 100644 (file)
@@ -63,17 +63,17 @@ $content = array(
 // Begin with doubler script...
 if (isFormSent()) {
        // Secure points (so only integer/double values are allowed
-       setPostRequestElement('points', bigintval(postRequestElement('points')));
+       setPostRequestParameter('points', bigintval(postRequestParameter('points')));
 
        // Begin with doubling process
-       if ((isPostRequestElementSet('userid')) && (isPostRequestElementSet('pass')) && (isPostRequestElementSet('points'))) {
+       if ((isPostRequestParameterSet('userid')) && (isPostRequestParameterSet('pass')) && (isPostRequestParameterSet('points'))) {
                // Probe for nickname extension and if a nickname was entered
-               if (isNickNameUsed(postRequestElement('userid'))) {
+               if (isNickNameUsed(postRequestParameter('userid'))) {
                        // Nickname in URL, so load the id
-                       fetchUserData(postRequestElement('userid'), 'nickname');
+                       fetchUserData(postRequestParameter('userid'), 'nickname');
                } else {
                        // Direct userid entered
-                       fetchUserData(postRequestElement('userid'));
+                       fetchUserData(postRequestParameter('userid'));
                }
 
                // Is the data valid?
@@ -83,13 +83,13 @@ if (isFormSent()) {
                } // END - if
 
                // Remove any dots and unwanted chars from the points
-               setPostRequestElement('points', bigintval(round(convertCommaToDot(postRequestElement('points')))));
+               setPostRequestParameter('points', bigintval(round(convertCommaToDot(postRequestParameter('points')))));
 
                // Probe for enough points
-               $probe_points = ((postRequestElement('points') >= getConfig('doubler_min')) && (postRequestElement('points') <= getConfig('doubler_max')));
+               $probe_points = ((postRequestParameter('points') >= getConfig('doubler_min')) && (postRequestParameter('points') <= getConfig('doubler_max')));
 
                // Check all together
-               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestElement('pass'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
+               if ((isUserDataValid()) && (getUserData('password') == generateHash(postRequestParameter('pass'), substr(getUserData('password'), 0, -40))) && (getUserData('status') == 'CONFIRMED') && ($probe_points)) {
                        // Nickname resolved to a unique userid or direct userid entered by the member
                        $GLOBALS['doubler_userid'] = getUserData('userid');
 
@@ -97,17 +97,17 @@ if (isFormSent()) {
                        $points = countSumTotalData(getUserData('userid'), 'user_points', 'points') - countSumTotalData(getUserData('userid'), 'user_data', 'used_points');
 
                        // So let's continue with probing his points amount
-                       if (($points - getConfig('doubler_left') - postRequestElement('points') * getConfig('doubler_charge')) >= 0) {
+                       if (($points - getConfig('doubler_left') - postRequestParameter('points') * getConfig('doubler_charge')) >= 0) {
                                // Enough points are left so let's continue with the doubling process
                                // Create doubling "account" width *DOUBLED* points
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES ('%s','%s','%s','".detectRemoteAddr()."', UNIX_TIMESTAMP(), 'N','N')",
-                                       array(getUserData('userid'), determineReferalId(), bigintval(postRequestElement('points') * 2)), __FILE__, __LINE__);
+                                       array(getUserData('userid'), determineReferalId(), bigintval(postRequestParameter('points') * 2)), __FILE__, __LINE__);
 
                                // Subtract entered points
-                               subtractPoints('doubler', getUserData('userid'), postRequestElement('points'));
+                               subtractPoints('doubler', getUserData('userid'), postRequestParameter('points'));
 
                                // Add points to "total payed" including charge
-                               $points = postRequestElement('points') - postRequestElement('points') * getConfig('doubler_charge');
+                               $points = postRequestParameter('points') - postRequestParameter('points') * getConfig('doubler_charge');
                                updateConfiguration('doubler_points', $points, '+');
                                incrementConfigEntry('doubler_points', $points);
 
@@ -117,7 +117,7 @@ if (isFormSent()) {
                                        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_doubler` (`userid`, `refid`, `points`, `remote_ip`, `timemark`, `completed`, `is_ref`) VALUES ('%s',0,'%s','".detectRemoteAddr()."',UNIX_TIMESTAMP(),'N','Y')",
                                                array(
                                                        determineReferalId(),
-                                                       bigintval(postRequestElement('points') * 2 * getConfig('doubler_ref'))
+                                                       bigintval(postRequestParameter('points') * 2 * getConfig('doubler_ref'))
                                                ), __FILE__, __LINE__);
 
                                        // And that's why we don't want to you more than one referal level of doubler-points. ^^^
@@ -127,7 +127,7 @@ if (isFormSent()) {
                                updateConfiguration('doubler_counter', 1, '+');
 
                                // Set constant
-                               $content['message'] = loadTemplate('doubler_reflink', true, postRequestElement('userid'));
+                               $content['message'] = loadTemplate('doubler_reflink', true, postRequestParameter('userid'));
                        } else {
                                // Not enougth points left
                                $content['message'] = getMessage('DOUBLER_FORM_NO_POINTS_LEFT');
@@ -141,26 +141,26 @@ if (isFormSent()) {
                } elseif (getUserData('status') == 'LOCKED') {
                        // Account is locked by admin / holiday!
                        $content['message'] = getMessage('DOUBLER_FORM_STATUS_LOCKED');
-               } elseif (postRequestElement('points') < getConfig('doubler_min')) {
+               } elseif (postRequestParameter('points') < getConfig('doubler_min')) {
                        // Not enougth points entered
                        $content['message'] = getMessage('DOUBLER_FORM_POINTS_MIN');
-               } elseif (postRequestElement('points') > getConfig('doubler_max')) {
+               } elseif (postRequestParameter('points') > getConfig('doubler_max')) {
                        // Too much points entered
                        $content['message'] = getMessage('DOUBLER_FORM_POINTS_MAX');
-               } elseif (isNickNameUsed(postRequestElement('userid'))) {
+               } elseif (isNickNameUsed(postRequestParameter('userid'))) {
                        // Cannot resolv nickname -> userid
                        $content['message'] = getMessage('DOUBLER_FORM_404_NICKNAME');
                } else {
                        // Wrong password or account not found
                        $content['message'] = getMessage('DOUBLER_FORM_404_MEMBER');
                }
-       } elseif (!isPostRequestElementSet('userid')) {
+       } elseif (!isPostRequestParameterSet('userid')) {
                // Login not entered
                $content['message'] = getMessage('DOUBLER_FORM_404_LOGIN');
-       } elseif (!isPostRequestElementSet('pass')) {
+       } elseif (!isPostRequestParameterSet('pass')) {
                // Password not entered
                $content['message'] = getMessage('DOUBLER_FORM_404_PASSWORD');
-       } elseif (!isPostRequestElementSet('points')) {
+       } elseif (!isPostRequestParameterSet('points')) {
                // points not entered
                $content['message'] = getMessage('DOUBLER_FORM_404_POINTS');
        }
diff --git a/img.php b/img.php
index 6986a5e..baf24ea 100644 (file)
--- a/img.php
+++ b/img.php
@@ -50,13 +50,13 @@ require('inc/config-global.php');
 loadIncludeOnce('inc/header.php');
 
 // Code set?
-if (isGetRequestElementSet('code')) {
+if (isGetRequestParameterSet('code')) {
        // Generate image
-       generateImageOrCode(bigintval(getRequestElement('code')));
-} elseif (isGetRequestElementSet('img')) {
+       generateImageOrCode(bigintval(getRequestParameter('code')));
+} elseif (isGetRequestParameterSet('img')) {
        // 'img' set so create the IFN (Include-FileName)
        $inc = sprintf("inc/img/tag-%s.php",
-               getRequestElement('img')
+               getRequestParameter('img')
        );
 
        // Include is readable?
index 56ec8c8..215dc7d 100644 (file)
@@ -84,11 +84,13 @@ PRIMARY KEY (`network_type_id`)
                // HTTP parameters (names) for URLs
                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_request_params`');
                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_network_request_params` (
-`network_param_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`network_param_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `request_param_key` VARCHAR(10) NOT NULL DEFAULT 'invalid',
 `request_param_value` VARCHAR(10) NOT NULL DEFAULT 'invalid',
-UNIQUE `provider_key` (`network_id`, `request_param_key`),
+UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`),
+UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`),
 PRIMARY KEY (`network_param_id`)
 ) TYPE={?_TABLE_TYPE?} COMMENT='Request parameters for GET/POST request'");
 
index 4153a13..c28d8fb 100644 (file)
@@ -689,9 +689,9 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                // Fix module
                if (!isModuleSet()) {
                        // Is the request element set?
-                       if (isGetRequestElementSet('module')) {
+                       if (isGetRequestParameterSet('module')) {
                                // Set module from request
-                               setModule(getRequestElement('module'));
+                               setModule(getRequestParameter('module'));
                        } elseif (getOutputMode() == '0') {
                                // Set default module 'index'
                                setModule('index');
@@ -769,7 +769,7 @@ function FILTER_RUN_DAILY_RESET () {
        if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return;
 
        // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-       if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (getOutputMode() != 1)) {
+       if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) {
                // Tell every module we are in reset-mode!
                doReset();
        } // END - if
@@ -924,7 +924,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 // Filter for displaying copyright line
 function FILTER_DISPLAY_COPYRIGHT () {
        // Shall we display the copyright notice?
-       if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestParameterSet('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! :-)
@@ -940,7 +940,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') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayParsingTime();
        } // END - if
index a7cd723..9bf6d0f 100644 (file)
@@ -1651,7 +1651,7 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
        $NAV = '';
        for ($page = 1; $page <= $PAGES; $page++) {
                // Is the page currently selected or shall we generate a link to it?
-               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '<strong>-';
                } else {
@@ -1659,13 +1659,13 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
                        $NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
 
                        // Add userid when we shall show all mails from a single member
-                       if ((isGetRequestElementSet('userid')) && (bigintval(getRequestElement('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
+                       if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
 
                        // Close open anchor tag
                        $NAV .= '%}">';
                }
                $NAV .= $page;
-               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        // Is currently selected, so only highlight it
                        $NAV .= '-</strong>';
                } else {
@@ -2445,7 +2445,7 @@ function getActualVersion ($type = 'Revision') {
                $FQFN = sprintf("%s/.revision", getConfig('CACHE_PATH'));
 
                // Check if 'check_revision_data' is setted (switch for manually rewrite the .revision-File)
-               if ((isGetRequestElementSet('check_revision_data')) && (getRequestElement('check_revision_data') == 'yes')) {
+               if ((isGetRequestParameterSet('check_revision_data')) && (getRequestParameter('check_revision_data') == 'yes')) {
                        // Forced rebuild of .revision file
                        $new = true;
                } else {
@@ -2680,11 +2680,11 @@ function getMessageFromErrorCode ($code) {
                case getCode('COOKIES_DISABLED')   : $message = getMessage('LOGIN_COOKIES_DISABLED'); break;
                case getCode('BEG_SAME_AS_OWN')    : $message = getMessage('BEG_SAME_UID_AS_OWN'); break;
                case getCode('LOGIN_FAILED')       : $message = getMessage('LOGIN_FAILED_GENERAL'); break;
-               case getCode('MODULE_MEM_ONLY')    : $message = getMaskedMessage('MODULE_MEM_ONLY', getRequestElement('mod')); break;
+               case getCode('MODULE_MEM_ONLY')    : $message = getMaskedMessage('MODULE_MEM_ONLY', getRequestParameter('mod')); break;
                case getCode('OVERLENGTH')         : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
                case getCode('URL_FOUND')          : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
                case getCode('SUBJ_URL')           : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-               case getCode('BLIST_URL')          : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
+               case getCode('BLIST_URL')          : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestParameter('blist'), 0); break;
                case getCode('NO_RECS_LEFT')       : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
                case getCode('INVALID_TAGS')       : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
                case getCode('MORE_POINTS')        : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
@@ -2704,8 +2704,8 @@ function getMessageFromErrorCode ($code) {
                        break;
 
                case getCode('EXTENSION_PROBLEM'):
-                       if (isGetRequestElementSet('ext')) {
-                               $message = generateExtensionInactiveNotInstalledMessage(getRequestElement('ext'));
+                       if (isGetRequestParameterSet('ext')) {
+                               $message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext'));
                        } else {
                                $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT');
                        }
@@ -2714,7 +2714,7 @@ function getMessageFromErrorCode ($code) {
                case getCode('URL_TLOCK'):
                        // @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(getRequestElement('id'))), __FILE__, __LINE__);
+                               array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Load timestamp from last order
                        list($timestamp) = SQL_FETCHROW($result);
@@ -3159,18 +3159,18 @@ function determineReferalId () {
        // Check if refid is set
        if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
                // This is fine...
-       } elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+       } elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
                // The variable user comes from the click-counter script click.php and we only accept this here
-               $GLOBALS['refid'] = bigintval(getRequestElement('user'));
-       } elseif (isPostRequestElementSet('refid')) {
+               $GLOBALS['refid'] = bigintval(getRequestParameter('user'));
+       } elseif (isPostRequestParameterSet('refid')) {
                // Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
-               $GLOBALS['refid'] = secureString(postRequestElement('refid'));
-       } elseif (isGetRequestElementSet('refid')) {
+               $GLOBALS['refid'] = secureString(postRequestParameter('refid'));
+       } elseif (isGetRequestParameterSet('refid')) {
                // Get referal id from variable refid (so I hope this makes my script more compatible to other scripts)
-               $GLOBALS['refid'] = secureString(getRequestElement('refid'));
-       } elseif (isGetRequestElementSet('ref')) {
+               $GLOBALS['refid'] = secureString(getRequestParameter('refid'));
+       } elseif (isGetRequestParameterSet('ref')) {
                // Set refid=ref (the referal link uses such variable)
-               $GLOBALS['refid'] = secureString(getRequestElement('ref'));
+               $GLOBALS['refid'] = secureString(getRequestParameter('ref'));
        } elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
                // Set session refid als global
                $GLOBALS['refid'] = bigintval(getSession('refid'));
@@ -3276,15 +3276,15 @@ function isMemberIdSet () {
 
 // Handle message codes from URL
 function handleCodeMessage () {
-       if (isGetRequestElementSet('code')) {
+       if (isGetRequestParameterSet('code')) {
                // Default extension is 'unknown'
                $ext = 'unknown';
 
                // Is extension given?
-               if (isGetRequestElementSet('ext')) $ext = getRequestElement('ext');
+               if (isGetRequestParameterSet('ext')) $ext = getRequestParameter('ext');
 
                // Convert the 'code' parameter from URL to a human-readable message
-               $message = getMessageFromErrorCode(getRequestElement('code'));
+               $message = getMessageFromErrorCode(getRequestParameter('code'));
 
                // Load message template
                loadTemplate('message', false, $message);
@@ -3732,7 +3732,7 @@ function sendModeMails ($mod, $modes) {
                $hash = generatePassString(getUserData('password'));
 
                // Does the hash match or should we change it?
-               if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
+               if (($hash == getSession('u_hash')) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
                        // Load the data
                        $content = getUserDataArray();
 
@@ -3750,7 +3750,7 @@ function sendModeMails ($mod, $modes) {
                                                switch ($mode) {
                                                        case 'normal': break; // Do not add any special lines
                                                        case 'email': // Email was changed!
-                                                               $content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestElement('old_email')."\n";
+                                                               $content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestParameter('old_email')."\n";
                                                                break;
 
                                                        case 'pass': // Password was changed
@@ -3766,7 +3766,7 @@ function sendModeMails ($mod, $modes) {
 
                                        if (isExtensionActive('country')) {
                                                // Replace code with description
-                                               $content['country'] = generateCountryInfo(postRequestElement('country_code'));
+                                               $content['country'] = generateCountryInfo(postRequestParameter('country_code'));
                                        } // END - if
 
                                        // Merge content with data from POST
index 6b265c8..58ba602 100644 (file)
@@ -78,7 +78,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
 } // END - if
 
 // Add BODY tag or not?
-if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestElementSet('frame')))) {
+if ((getOutputMode() != 1) && (getOutputMode() != -1) && ($GLOBALS['header_sent'] == 1) && ((getModule() != 'frametester') || (isGetRequestParameterSet('frame')))) {
        loadTemplate('page_body');
        $GLOBALS['header_sent'] = 2;
 } // END - if
index 42b6493..3803f72 100644 (file)
@@ -48,27 +48,27 @@ if (!defined('__SECURITY')) {
 // Write the local config-local.php file from "template"
 function doInstallWriteLocalConfig () {
        // Copy the config template and verify it
-       copyFileVerified(postRequestElement('spath') . 'inc/config-local.php.dist', getConfig('CACHE_PATH') . 'config-local.php', 0644);
+       copyFileVerified(postRequestParameter('spath') . 'inc/config-local.php.dist', getConfig('CACHE_PATH') . 'config-local.php', 0644);
 
        // Ok, all done. So we can write the config data to the php files
-       if (postRequestElement('spath') != getConfig('PATH')) changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestElement('spath'), 0);
-       if (postRequestElement('burl')  != getConfig('URL'))  changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'HOST-URL', "setConfigEntry('URL', '", "');", postRequestElement('burl'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestElement('title'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestElement('slogan'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestElement('email'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestElement('warn_no_pass'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestElement('wfooter'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestElement('blink'), 0);
-       // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-HOST', "  'host'     => '", "',", postRequestElement('mysql','host'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-DBASE', " 'dbase'    => '", "',", postRequestElement('mysql','dbase'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-LOGIN', " 'login'    => '", "',", postRequestElement('mysql','login'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-PASSWORD', "      'password' => '", "',", postRequestElement('mysql','pass1'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestElement('mysql','prefix'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestElement('mysql','type'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestElement('smtp_host'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestElement('smtp_user'), 0);
-       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestElement('smtp_pass1'), 0);
+       if (postRequestParameter('spath') != getConfig('PATH')) changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SERVER-PATH', "setConfigEntry('PATH', '", "');", postRequestParameter('spath'), 0);
+       if (postRequestParameter('burl')  != getConfig('URL'))  changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'HOST-URL', "setConfigEntry('URL', '", "');", postRequestParameter('burl'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MAIN-TITLE', "setConfigEntry('MAIN_TITLE', '", "');", postRequestParameter('title'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SLOGAN', "setConfigEntry('SLOGAN', '", "');", postRequestParameter('slogan'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'WEBMASTER', "setConfigEntry('WEBMASTER', '", "');", postRequestParameter('email'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", postRequestParameter('warn_no_pass'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", postRequestParameter('wfooter'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", postRequestParameter('blink'), 0);
+       // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-HOST', "  'host'     => '", "',", postRequestParameter('mysql','host'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-DBASE', " 'dbase'    => '", "',", postRequestParameter('mysql','dbase'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-LOGIN', " 'login'    => '", "',", postRequestParameter('mysql','login'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-PASSWORD', "      'password' => '", "',", postRequestParameter('mysql','pass1'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", postRequestParameter('mysql','prefix'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", postRequestParameter('mysql','type'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", postRequestParameter('smtp_host'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", postRequestParameter('smtp_user'), 0);
+       changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", postRequestParameter('smtp_pass1'), 0);
 
        // Generate a long site key
        $siteKey = generatePassword(50);
index 09f399c..51d2fa1 100644 (file)
@@ -47,43 +47,43 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 $mysql = array();
-if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
        // Transfer 'mysql' array
-       $mysql = postRequestElement('mysql');
+       $mysql = postRequestParameter('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
-if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
+if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
        // Okay, we have to check it
-       if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
+       if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
                // Hostname not set
                addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');
-               setGetRequestElement('page', 3);
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
+       if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
                // Password is empty
                addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');
-               setGetRequestElement('page', 3);
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
+       if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
                // Password repeat is empty
                addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');
-               setGetRequestElement('page', 3);
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
+       if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
                // Passwords are not matching
                addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');
-               setGetRequestElement('page', 3);
+               setGetRequestParameter('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 (getRequestElement('page')) {
+       switch (getRequestParameter('page')) {
                case 'welcome': // Welcome to the installation!
                        addTemplateToInstallContent('install_welcome');
                        break;
@@ -111,11 +111,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['mysql_prefix'] = $mysql['prefix'];
                        $content['mysql_login']  = $mysql['login'];
                        $content['table_type']   = $mysql['type'];
-                       $content['spath']        = postRequestElement('spath');
-                       $content['burl']         = postRequestElement('burl');
-                       $content['title']        = postRequestElement('title');
-                       $content['slogan']       = postRequestElement('slogan');
-                       $content['email']        = postRequestElement('email');
+                       $content['spath']        = postRequestParameter('spath');
+                       $content['burl']         = postRequestParameter('burl');
+                       $content['title']        = postRequestParameter('title');
+                       $content['slogan']       = postRequestParameter('slogan');
+                       $content['email']        = postRequestParameter('email');
 
                        // Load template
                        addTemplateToInstallContent('install_page2', $content);
@@ -123,11 +123,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '3':
                        // Set more values
-                       $content['spath']      = postRequestElement('spath');
-                       $content['burl']       = postRequestElement('burl');
-                       $content['title']      = postRequestElement('title');
-                       $content['slogan']     = postRequestElement('slogan');
-                       $content['email']      = postRequestElement('email');
+                       $content['spath']      = postRequestParameter('spath');
+                       $content['burl']       = postRequestParameter('burl');
+                       $content['title']      = postRequestParameter('title');
+                       $content['slogan']     = postRequestParameter('slogan');
+                       $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data
                        $smtpHost  = getConfig('SMTP_HOSTNAME');
@@ -136,11 +136,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $smtpPass2 = getConfig('SMTP_PASSWORD');
 
                        // Overwrite it with the data from sent (failed) form
-                       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');
+                       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');
                        } // END - if
 
                        // MySQL settings
@@ -164,16 +164,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '5': // Misc settings
                        // General settings
-                       $content['spath']  = postRequestElement('spath');
-                       $content['burl']   = postRequestElement('burl');
-                       $content['title']  = postRequestElement('title');
-                       $content['slogan'] = postRequestElement('slogan');
-                       $content['email']  = postRequestElement('email');
+                       $content['spath']  = postRequestParameter('spath');
+                       $content['burl']   = postRequestParameter('burl');
+                       $content['title']  = postRequestParameter('title');
+                       $content['slogan'] = postRequestParameter('slogan');
+                       $content['email']  = postRequestParameter('email');
 
                        // SMTP settings
-                       $content['smtp_host'] = postRequestElement('smtp_host');
-                       $content['smtp_user'] = postRequestElement('smtp_user');
-                       $content['smtp_pass'] = postRequestElement('smtp_pass1');
+                       $content['smtp_host'] = postRequestParameter('smtp_host');
+                       $content['smtp_user'] = postRequestParameter('smtp_user');
+                       $content['smtp_pass'] = postRequestParameter('smtp_pass1');
 
                        // MySQL data
                        $OUT = '';
@@ -187,7 +187,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                case 'finalize': // Write captured data to files
-                       if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
+                       if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
@@ -197,20 +197,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        // Seems to work, also right database?
                                        if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
                                                // Automatically run install.sql
-                                               if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                                               if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found!
                                                        addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
                                                } // END - if
 
                                                if (getTotalFatalErrors() == '0') {
                                                        // Set type and prefix from POST data
-                                                       setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
-                                                       setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
+                                                       setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
+                                                       setConfigEntry('_MYSQL_PREFIX', postRequestParameter('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 = postRequestElement('spath') . 'install/' . $dump . '.sql';
+                                                               $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
 
                                                                // Is the file readable?
                                                                if (isFileReadable($FQFN)) {
@@ -253,12 +253,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                                        } // END foreach
                                        $content['mysql_hidden'] = $OUT;
-                                       $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');
+                                       $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');
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
@@ -283,7 +283,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
                        addTemplateToInstallContent('admin_settings_saved', '<div class="install_error">{--WRONG_PAGE--}</div>');
                        break;
        } // END - switch
index b2de5c6..af7fe53 100644 (file)
@@ -45,8 +45,8 @@ if (!defined('__SECURITY')) {
 
 // Prepare content
 $content = array(
-       'views_max' => bigintval(getRequestElement('views_max')),
-       'limited'   => bigintval(getRequestElement('limited'))
+       'views_max' => bigintval(getRequestParameter('views_max')),
+       'limited'   => bigintval(getRequestParameter('limited'))
 );
 
 // Simply load the JavaScript here
index 5bc33ba..1297d37 100644 (file)
@@ -45,8 +45,8 @@ if (!defined('__SECURITY')) {
 
 // Prepare content
 $content = array(
-       'restart'   => bigintval(getRequestElement('restart')),
-       'autostart' => getRequestElement('autostart')
+       'restart'   => bigintval(getRequestParameter('restart')),
+       'autostart' => getRequestParameter('autostart')
 );
 
 // Load template
index 21dc3ed..d0dd156 100644 (file)
@@ -110,9 +110,9 @@ function getLanguage () {
        if (isConfigEntrySet('DEFAULT_LANG')) $ret = getConfig('DEFAULT_LANG');
 
        // Is the variable set
-       if (isGetRequestElementSet('mx_lang')) {
+       if (isGetRequestParameterSet('mx_lang')) {
                // Accept only first 2 chars
-               $ret = substr(getRequestElement('mx_lang'), 0, 2);
+               $ret = substr(getRequestParameter('mx_lang'), 0, 2);
        } elseif (isset($GLOBALS['language'])) {
                // Use cached
                $ret = getCurrentLanguage();
index 67563ea..493aa2a 100644 (file)
@@ -56,19 +56,22 @@ addMessages(array(
        'ADMIN_NETWORK_DATA_NOT_ADDED' => "Das Werbenetzwerk mit dem Kurznamen <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
        'ADMIN_NETWORK_TYPES_404' => "Es wurden keine Werbearten-Handler zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
        'ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED' => "Ein Werbeart-Handler <span class=\"data\">%s</span> existiert bereits.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED' => "Ein API-Abfrageparameter <span class=\"data\">%s</span> existiert bereits.",
        'ADMIN_NETWORK_TYPES_NOT_ADDED' => "Der Werbeart-Handler <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
        'ADMIN_NETWORK_TYPES_NOTHING_FOUND' => "Es wurden keine Werbart-Handler zum Editieren oder L&ouml;schen gefunden.",
        'ADMIN_NETWORK_PARAMS_404' => "Es wurden keine API-Abfrageparameter zum Werbenetzwerk <span class=\"data\">%s</span> gefunden.",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED' => "Der API-Abfrageparameter <span class=\"data\">%s</span> wurde nicht hinzugef&uuml;gt.",
        // - Form titles
        'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzuf&uuml;gen - Allgemeine Daten",
        'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten",
        'ADMIN_NETWORK_DELETE_TITLE' => "Werbenetzwerk l&ouml;schen - Allgemeine Daten",
        'ADMIN_NETWORK_SELECT_TITLE' => "Werbenetzwerk ausw&auml;hlen",
        'ADMIN_NETWORK_TYPES_ADD_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzuf&uuml;gen",
+       'ADMIN_NETWORK_TYPES_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        'ADMIN_NETWORK_TYPES_EDIT_TITLE' => "Werbeart-Handler editieren",
        'ADMIN_NETWORK_TYPES_DELETE_TITLE' => "Werbeart-Handle l&ouml;schen",
-       'ADMIN_NETWORK_TYPES_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten",
        'ADMIN_NETWORK_PARAMS_ADD_TITLE' => "Werbenetzwerk verwalten - Neuen API-Abfrageparameter hinzuf&uuml;gen",
+       'ADMIN_NETWORK_PARAMS_LIST_TITLE' => "API-Abfrageparameter auflisten und verwalten",
        // - Link titles
        'ADMIN_NETWORK_LIST_TYPES_LINK_TITLE' => "Weiter zu den Werbearten",
        'ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE' => "Weiter zu den Abfrageparametern",
@@ -87,9 +90,12 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_CHANGE' => "Handler &auml;ndern",
        'ADMIN_NETWORK_TYPES_REMOVE' => "Handler entfernen",
        'ADMIN_NETWORK_PARAMS_ADD' => "Abfrageparameter hinzuf&uuml;gen",
+       'ADMIN_NETWORK_PARAMS_EDIT' => "Editieren",
+       'ADMIN_NETWORK_PARAMS_DELETE' => "L&ouml;schen",
        // - Success titles
        'ADMIN_NETWORK_ADDED_TITLE' => "Allgemeine Werbenetzwerkdaten hinzugef&uuml;gt.",
        'ADMIN_NETWORK_TYPES_ADDED_TITLE' => "Werbeart-Handler hinzugef&uuml;gt.",
+       'ADMIN_NETWORK_REQUEST_PARAM_ADDED_TITLE' => "API-Abfrageparameter hinzugef&uuml;gt",
        // - Success nots
        'ADMIN_NETWORK_UPDATED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge in den allgemeinen Daten aktualisiert.",
        'ADMIN_NETWORK_REMOVED' => "Es wurden <span class=\"data\">%s</span> Eintr&auml;ge aus den allgemeinen Daten gel&ouml;scht.",
@@ -101,6 +107,7 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_ADD_NOTE' => "F&uuml;gen Sie hier weitere Werbearten dem ausgw&auml;hlten Werbenetzwerk hinzu. Die Abfrage-, Klick- und Banner-URL m&uuml;ssen dabei Platzhalter enthalten, die Sie der Dokumentation und <a href=\"http://forum.mxchange.org/forum-43.html\" rel=\"external\" title=\"Direkt-Link zur Forumkategorie Werbenetzwerke\" target=\"_blank\">dem Forum</a> entnehmen k&ouml;nnen.",
        'ADMIN_NETWORK_TYPES_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Platzhaltern (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
        'ADMIN_NETWORK_PARAMS_ADD_NOTE' => "F&uuml;gen Sie hier weitere Abfrageparameter dem ausgw&auml;hlten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.",
+       'ADMIN_NETWORK_PARAMS_LIST_NOTE' => "Seien Sie mit dem L&ouml;schen und Editieren von API-Abfrageparameter sehr vorsichtig. Sie sollten hierzu R&uuml;cksprache <a href=\"http://forum.mxchange.org/forum-43.html\" target=\"_blank\" title=\"Direktlink zum Forum\">im Forum</a> halten. Dokumentation zu den Abfragenamen (&#37;FOO&#37;, &#37;BAR&#37; usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.",
        // - Advertise types
        'ADMIN_NETWORK_TYPES_BANNERCLICK' => "Banner-Klick",
        'ADMIN_NETWORK_TYPES_BANNERVIEW' => "Banner-View",
@@ -143,13 +150,17 @@ addMessages(array(
        'ADMIN_NETWORK_TYPES_CLICK_URL' => "Klick-URL der Werbeart",
        'ADMIN_NETWORK_TYPES_BANNER_URL' => "Banner-URL der Werbeart",
        // - API request parameter
+       'ADMIN_NETWORK_TYPE_SELECT' => "Werbeart-Handler ausw&auml;hlen",
        'ADMIN_NETWORK_PARAMS_KEY' => "Abfragename",
        'ADMIN_NETWORK_PARAMS_VALUE' => "Abfrageparameter",
        'ADMIN_NETWORK_PARAMS_ID' => "Kundennummer (Id)",
+       'ADMIN_NETWORK_PARAMS_SID' => "Webseiten-Id",
        'ADMIN_NETWORK_PARAMS_PASSWORD' => "Interface-Kennwort",
        'ADMIN_NETWORK_PARAMS_RELOAD' => "Maximale Reloadsperre",
+       'ADMIN_NETWORK_PARAMS_MINIMUM_STAY' => "Mindestauffenthalt",
        'ADMIN_NETWORK_PARAMS_REMAIN' => "Mindestanzahl der restlichen Klicks",
        'ADMIN_NETWORK_PARAMS_REWARD' => "Mindestverg&uuml;tung",
+       'ADMIN_NETWORK_PARAMS_SIZE' => "Werbemittelgr&ouml;sse",
        'ADMIN_NETWORK_PARAMS_EROTIC' => "Erotik erlaubt",
 ));
 
index 72b6b2e..2730199 100644 (file)
@@ -318,7 +318,7 @@ LIMIT 1",
                $bonus = (SQL_AFFECTEDROWS() == 1);
        } // END - if
 
-       if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
+       if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '</div>';
        } elseif (isExtensionActive('bonus')) {
index cf27043..cc03096 100644 (file)
@@ -44,9 +44,9 @@ if (!defined('__SECURITY')) {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isPostRequestElementSet('edit')) || (isPostRequestElementSet('del')) || (isPostRequestElementSet('change')) || (isPostRequestElementSet('remove'))) {
+       if ((isFormSent()) || (isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('del')) || (isPostRequestParameterSet('change')) || (isPostRequestParameterSet('remove'))) {
                // Do we have a 'do'?
-               if (isGetRequestElementSet('do')) {
+               if (isGetRequestParameterSet('do')) {
                        // Process the request
                        doAdminNetworkProcessForm();
                } else {
@@ -59,23 +59,23 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isPostRequestElementSet('edit')) && (!isPostRequestElementSet('del')) && (!isPostRequestElementSet('change')) && (!isPostRequestElementSet('remove'))) {
+       if ((!isFormSent()) && (!isPostRequestParameterSet('edit')) && (!isPostRequestParameterSet('del')) && (!isPostRequestParameterSet('change')) && (!isPostRequestParameterSet('remove'))) {
                // Abort here
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
                return;
-       } elseif (!isGetRequestElementSet('do')) {
+       } elseif (!isGetRequestParameterSet('do')) {
                // No 'do' found
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
                return;
        }
 
        // Create function name
-       $functionName = sprintf("doAdminNetworkProcess%sForm", ucfirst(strtolower(getRequestElement('do'))));
+       $functionName = sprintf("doAdminNetworkProcess%sForm", ucfirst(strtolower(getRequestParameter('do'))));
 
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name
-               debug_report_bug('Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
+               debug_report_bug('Invalid do ' . getRequestParameter('do') . ', function ' . $functionName .' does not exist.', false);
        } // END - if
 
        // Call-back the method handling our request
@@ -114,6 +114,22 @@ function isNetworkTypeHandleValid ($type, $networkId) {
        return $isValid;
 }
 
+// Checks wether the given network request parameter is already used (valid)
+function isNetworkRequestParameterValid ($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__);
+
+       // Does it exist?
+       $isValid = (SQL_NUMROWS($result) == 1);
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return result
+       return $isValid;
+}
+
 // "Getter" for a network's data by provided id number
 function getNetworkDataById ($id) {
        // Ids lower one are not accepted
@@ -259,14 +275,14 @@ ORDER BY
 // Callback function to add new network
 function doAdminNetworkProcessAddnetworkForm () {
        // We can say here, the form is sent, so check if the network is already added
-       if (isNetworkNameValid(postRequestElement('network_short_name'))) {
+       if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
                // Already there
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestElement('network_short_name')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_ALREADY_ADDED', postRequestParameter('network_short_name')));
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestElement('ok');
+       unsetPostRequestParameter('ok');
 
        // Add the whole request to database
        SQL_QUERY("INSERT INTO
@@ -278,7 +294,7 @@ function doAdminNetworkProcessAddnetworkForm () {
 )", __FUNCTION__, __LINE__);
 
        // Add the id for output only
-       setPostRequestElement('network_id', SQL_INSERTID());
+       setPostRequestParameter('network_id', SQL_INSERTID());
 
        // Output message
        if (SQL_AFFECTEDROWS() == 1) {
@@ -286,7 +302,7 @@ function doAdminNetworkProcessAddnetworkForm () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestElement('network_short_name')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_DATA_NOT_ADDED', postRequestParameter('network_short_name')));
        }
 }
 
@@ -296,7 +312,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
        if (countPostSelection() > 0) {
                // Something has been selected, so start displaying one by one
                $SW = 2; $OUT = '';
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -307,7 +323,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
                                        // Add color
                                        $networkData['sw'] = $SW;
 
-                                       if (isPostRequestElementSet('edit')) {
+                                       if (isPostRequestParameterSet('edit')) {
                                                // Make selection box for network_request_type
                                                $networkData['network_request_type'] = generateOptionList(
                                                        '/ARRAY/',
@@ -321,7 +337,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 
                                                // Add row template for editing
                                                $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
-                                       } elseif (isPostRequestElementSet('del')) {
+                                       } elseif (isPostRequestParameterSet('del')) {
                                                // Translate the request type
                                                $networkData['network_request_type'] = getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type']);
 
@@ -341,9 +357,9 @@ function doAdminNetworkProcessHandlenetworkForm () {
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Output main template
-                       if (isPostRequestElementSet('edit')) {
+                       if (isPostRequestParameterSet('edit')) {
                                loadTemplate('admin_edit_networks', false, $OUT);
-                       } elseif (isPostRequestElementSet('del')) {
+                       } elseif (isPostRequestParameterSet('del')) {
                                loadTemplate('admin_del_networks', false, $OUT);
                        } else {
                                // Problem!
@@ -364,11 +380,11 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
        // Do we have selections?
        if (countPostSelection() > 0) {
                // Load network data
-               $networkData = getNetworkDataById(getRequestElement('network'));
+               $networkData = getNetworkDataById(getRequestParameter('network'));
 
                // Something has been selected, so start displaying one by one
                $SW = 2; $OUT = '';
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -379,10 +395,10 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                                        // Add color
                                        $networkTypeData['sw'] = $SW;
 
-                                       if (isPostRequestElementSet('edit')) {
+                                       if (isPostRequestParameterSet('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
-                                       } elseif (isPostRequestElementSet('del')) {
+                                       } elseif (isPostRequestParameterSet('del')) {
                                                // Fix empty banner URL
                                                if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
 
@@ -404,13 +420,13 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                        // Prepare content for template
                        $content = array(
                                'rows' => $OUT,
-                               'network_data' => getNetworkDataById(getRequestElement('network'))
+                               'network_data' => getNetworkDataById(getRequestParameter('network'))
                        );
 
                        // Output main template
-                       if (isPostRequestElementSet('edit')) {
+                       if (isPostRequestParameterSet('edit')) {
                                loadTemplate('admin_edit_network_types', false, $content);
-                       } elseif (isPostRequestElementSet('del')) {
+                       } elseif (isPostRequestParameterSet('del')) {
                                loadTemplate('admin_del_network_types', false, $content);
                        } else {
                                // Problem!
@@ -434,7 +450,7 @@ function doAdminNetworkProcessChangenetworkForm () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -479,7 +495,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -501,19 +517,19 @@ function doAdminNetworkProcessRemovenetworkForm () {
 // Add a network type handler if not yet found
 function doAdminNetworkProcessAddnetworktypeForm () {
        // Is the network type handle already used with given network?
-       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network'))) {
+       if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestElement('network_type_handle')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED', postRequestParameter('network_type_handle')));
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestElement('ok');
+       unsetPostRequestParameter('ok');
 
        // Add id
-       setPostRequestElement('network_id', getRequestElement('network'));
+       setPostRequestParameter('network_id', getRequestParameter('network'));
 
        // Add the whole request to database
        SQL_QUERY("INSERT INTO
@@ -530,7 +546,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestElement('network_type_handle')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_NOT_ADDED', postRequestParameter('network_type_handle')));
        }
 }
 
@@ -542,7 +558,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -587,7 +603,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -606,5 +622,41 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
        } // END - if
 }
 
+// Adds a request parameter to given network and type
+function doAdminNetworkProcessAddnetworkparamForm () {
+       // Is the request parameter already used with given network?
+       if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
+               // Already added
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED', postRequestParameter('request_param_key')));
+
+               // ... so abort here
+               return false;
+       } // END - if
+
+       // Remove the 'ok' part
+       unsetPostRequestParameter('ok');
+
+       // Add id
+       setPostRequestParameter('network_id', getRequestParameter('network'));
+
+       // Add the whole request to database
+       SQL_QUERY("INSERT INTO
+       `{?_MYSQL_PREFIX?}_network_request_params`
+(
+       `" . implode('`,`', array_keys(postRequestArray())) . "`
+) VALUES (
+       '" . implode("','", array_values(postRequestArray())) . "'
+)", __FUNCTION__, __LINE__);
+
+       // Output message
+       if (SQL_AFFECTEDROWS() == 1) {
+               // Successfully added
+               loadTemplate('admin_network_request_param_added', false, postRequestArray());
+       } else {
+               // Not added
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED', postRequestParameter('request_param_key')));
+       }
+}
+
 // [EOF]
 ?>
index 0de1fe3..5dae6a1 100644 (file)
@@ -127,7 +127,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 (postRequestElement('auto_urls') == 'Y') {
+       if (postRequestParameter('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
                if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
                        // Send HTML mail
index eefb919..5ef7018 100644 (file)
@@ -68,7 +68,7 @@ function displayDebugSqls () {
 // Filter for debugging SQLs
 function FILTER_DISPLAY_DEBUG_SQL () {
        // Shall we display SQL queries?
-       if ((isAdmin()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y') && (!isGetRequestElementSet('frame')) && ($GLOBALS['header_sent'] == 2)) {
+       if ((isAdmin()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y') && (!isGetRequestParameterSet('frame')) && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayDebugSqls();
        } // END - if
index 47fde78..2390f3a 100644 (file)
@@ -50,7 +50,7 @@ function loadPoliticianStopSnippet () {
 // Filter for displaying politician_stop snippet
 function FILTER_DISPLAY_POLITICIAN_STOP_SNIPPET () {
        // Shall we include the politician_stop snippet?
-       if ((!isGetRequestElementSet('frame')) && (isExtensionActive('politician_stop')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestParameterSet('frame')) && (isExtensionActive('politician_stop')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                loadPoliticianStopSnippet();
        } // END - if
index 7d58b8e..ef6b65c 100644 (file)
@@ -236,7 +236,7 @@ class PrimeraApi {
 // is not false the API data is valid, else invalid
 function testPrimeraApi () {
        // Get new instance
-       $api = new PrimeraApi(postRequestElement('primera_api_name'), postRequestElement('primera_api_md5'));
+       $api = new PrimeraApi(postRequestParameter('primera_api_name'), postRequestParameter('primera_api_md5'));
 
        // Was that fine?
        return ($api->getPrimera() !== false);
index efc9e4b..06abee9 100644 (file)
@@ -99,7 +99,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
                        );
 
                        // Mark categories
-                       if ((postRequestElement('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!isPostRequestElementSet('cat', $content['id'])))) {
+                       if ((postRequestParameter('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!isPostRequestParameterSet('cat', $content['id'])))) {
                                $content['def_y'] = ' checked="checked"';
                        } else {
                                $content['def_n'] = ' checked="checked"';
index 7ef4e61..99e8856 100644 (file)
@@ -137,7 +137,7 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
 
                                // Remove last ", " from SQL string
                                $sql = substr($sql, 0, -2)." WHERE `id`='%s' LIMIT 1";
-                               $DATA['values'][] = bigintval(getRequestElement('id'));
+                               $DATA['values'][] = bigintval(getRequestParameter('id'));
 
                                // Generate message
                                $message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_UPDATED'), 'updated', $messageArray);
index 5b2bca1..fd6fac6 100644 (file)
@@ -798,10 +798,10 @@ function SURFBAR_DETERMINE_TEMPLATE_NAME() {
        $templateName = "surfbar_frameset";
 
        // Any frame set? ;-)
-       if (isGetRequestElementSet('frame')) {
+       if (isGetRequestParameterSet('frame')) {
                // Use the frame as a template name part... ;-)
                $templateName = sprintf("surfbar_frame_%s",
-               getRequestElement('frame')
+               getRequestParameter('frame')
                );
        } // END - if
 
index e39f97f..4c5c934 100644 (file)
@@ -240,17 +240,17 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
-               $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
+               $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
 
                // Installation mode active
-               if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
+               if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
                        // Set cookie from URL data
-                       setTheme(getRequestElement('theme'));
-               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestElement('theme'))))) {
+                       setTheme(getRequestParameter('theme'));
+               } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", secureString(postRequestParameter('theme'))))) {
                        // Set cookie from posted data
-                       setTheme(secureString(postRequestElement('theme')));
+                       setTheme(secureString(postRequestParameter('theme')));
                }
 
                // Set return value
@@ -307,9 +307,9 @@ function getThemeId ($name) {
 // Filter for generic handling of theme change
 function FILTER_HANDLE_THEME_CHANGE () {
        // Check if new theme is selcted
-       if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
+       if ((isPostRequestParameterSet('new_theme')) && (postRequestParameter('new_theme') != getCurrentTheme())) {
                // Set new theme for guests
-               $newTheme = postRequestElement('new_theme');
+               $newTheme = postRequestParameter('new_theme');
 
                // Change to new theme
                setTheme($newTheme);
index 90b9867..7d6b342 100644 (file)
@@ -53,7 +53,7 @@ function loadUberwachSnippet () {
 // Filter for displaying uberwach snippet
 function FILTER_DISPLAY_UBERWACH_SNIPPET () {
        // Shall we include the uberwach snippet?
-       if ((!isGetRequestElementSet('frame')) && (isExtensionActive('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
+       if ((!isGetRequestParameterSet('frame')) && (isExtensionActive('uberwach')) && (getModule() != 'admin') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                loadUberwachSnippet();
        } // END - if
index 1c4bc86..0ef2a4c 100644 (file)
@@ -43,22 +43,22 @@ if (!defined('__SECURITY')) {
 
 // Add links for selecting some users
 function alpha ($sortby, $colspan, $return=false) {
-       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
-       $add = '&amp;page='.getRequestElement('page').'&amp;offset='.getRequestElement('offset');
-       if (isGetRequestElementSet('mode')) $add .= '&amp;mode='.getRequestElement('mode');
+       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+       $add = '&amp;page='.getRequestParameter('page').'&amp;offset='.getRequestParameter('offset');
+       if (isGetRequestParameterSet('mode')) $add .= '&amp;mode='.getRequestParameter('mode');
 
        /* Creates the list of letters and makes them a link. */
        $alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
        $num = count($alphabet) - 1;
        $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
-               if (getRequestElement('letter') == $ltr) {
+               if (getRequestParameter('letter') == $ltr) {
                        // Current letter is letter from URL
                        $OUT .= '<strong>' . $ltr . '</strong>';
                } else {
                        // Output link to letter
                        $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
-                       if (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
+                       if (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
                        $OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
                }
 
@@ -83,15 +83,15 @@ function alpha ($sortby, $colspan, $return=false) {
 // Add links for sorting
 function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        $OUT = '';
-       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
-       if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 0);
+       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 0);
 
        // Add page and offset
-       $add = '&amp;page=' . getRequestElement('page') . '&amp;offset=' . getRequestElement('offset');
+       $add = '&amp;page=' . getRequestParameter('page') . '&amp;offset=' . getRequestParameter('offset');
 
        // Add status or mode
-       if (isGetRequestElementSet('status'))   $add .= '&amp;mode=' . getRequestElement('status');
-       elseif (isGetRequestElementSet('mode')) $add .= '&amp;mode=' . getRequestElement('mode');
+       if (isGetRequestParameterSet('status'))   $add .= '&amp;mode=' . getRequestParameter('status');
+       elseif (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
 
        // Makes order by links..
        if ($letter == 'front') $letter = getMessage('_ALL2');
@@ -147,26 +147,26 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false)
 
        $OUT = '';
        for ($page = 1; $page <= $PAGES; $page++) {
-               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        $OUT .= '<strong>-';
                } else {
-                       if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', getMessage('_ALL2'));
-                       if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid');
+                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+                       if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
                        // Base link
                        $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                        // Add status or mode
-                       if (isGetRequestElementSet('status'))    $OUT .= '&amp;mode=' . getRequestElement('status');
-                        elseif (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
+                       if (isGetRequestParameterSet('status'))    $OUT .= '&amp;mode=' . getRequestParameter('status');
+                        elseif (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
 
                        // Letter and so on
-                       $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
+                       $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
                }
 
                $OUT .= $page;
 
-               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        $OUT .= '-</strong>';
                } else  {
                        $OUT .= '</a>';
index b6fe037..f17c928 100644 (file)
@@ -83,7 +83,7 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
 }
 
 // Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
        // No login entered and outside installation mode
        outputHtml('<strong>{--LANG_WARNING--}:</strong>');
        if (isInstalled()) {
index b47c597..d068ffd 100644 (file)
@@ -58,8 +58,8 @@ if ($DOUBLER_POINTS == '0') {
 } // END - if
 
 // If not currently doubled set it to zero
-unsetGetRequestElement('DOUBLER_UID');
-unsetPostRequestElement('DOUBLER_UID');
+unsetGetRequestParameter('DOUBLER_UID');
+unsetPostRequestParameter('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
 if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
 
index fabb665..3455022 100644 (file)
@@ -53,19 +53,19 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
-       if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass1')) || (strlen(postRequestElement('pass1')) < 4) || (!isPostRequestElementSet('pass2')) || (strlen(postRequestElement('pass2')) < 4) || (postRequestElement('pass1') != postRequestElement('pass2')))) {
-               setPostRequestElement('ok', '***');
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
+               setPostRequestParameter('ok', '***');
        } // END - if
 
-       if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+       if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
                // Hash the password with the old function because we are here in install mode
-               $hashedPass = md5(postRequestElement('pass1'));
+               $hashedPass = md5(postRequestParameter('pass1'));
 
                // Kill maybe existing session variables
                destroyAdminSession(false);
 
                // Do registration
-               $ret = addAdminAccount(postRequestElement('login'), $hashedPass, getConfig('WEBMASTER'));
+               $ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getConfig('WEBMASTER'));
 
                // Check if registration wents fine
                switch ($ret) {
@@ -98,8 +98,8 @@ if (!isAdminRegistered()) {
        if ($ret != 'done') {
                // Init login name
                $content['login'] = '';
-               if (isPostRequestElementSet('login')) {
-                       $content['login'] = postRequestElement('login');
+               if (isPostRequestParameterSet('login')) {
+                       $content['login'] = postRequestParameter('login');
                } // END - if
 
                // Init array elements
@@ -108,7 +108,7 @@ if (!isAdminRegistered()) {
                $content['pass2_message']    = '';
 
                // Yet-another notice-fix
-               if ((isFormSent()) && (postRequestElement('ok') == '***')) {
+               if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
                        // Init variables
                        $loginMessage = '';
                        $pass1Message = '';
@@ -121,15 +121,15 @@ if (!isAdminRegistered()) {
                        if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $ret;
 
                        // No password 1 entered or to short?
-                       if (!isPostRequestElementSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
-                        elseif (strlen(postRequestElement('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1');
+                       if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
+                        elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1');
 
                        // No password 2 entered or to short?
-                       if (!isPostRequestElementSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2');
-                        elseif (strlen(postRequestElement('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2');
+                       if (!isPostRequestParameterSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2');
+                        elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2');
 
                        // Both didn't match?
-                       if (postRequestElement('pass1') != postRequestElement('pass2')) {
+                       if (postRequestParameter('pass1') != postRequestParameter('pass2')) {
                                // No match
                                if (empty($pass1Message)) $pass1Message = getMessage('ADMIN_PASS1_MISMATCH');
                                if (empty($pass2Message)) $pass2Message = getMessage('ADMIN_PASS2_MISMATCH');
@@ -147,24 +147,24 @@ if (!isAdminRegistered()) {
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
        }
-} elseif (isGetRequestElementSet('reset_pass')) {
+} elseif (isGetRequestParameterSet('reset_pass')) {
        // Is the form submitted?
-       if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
+       if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
                // Output result
-               loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestElement('email')));
-       } elseif (isGetRequestElementSet('hash')) {
+               loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestParameter('email')));
+       } elseif (isGetRequestParameterSet('hash')) {
                // Output form for hash validation
-               loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
-       } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('hash'))) {
+               loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
+       } elseif ((isPostRequestParameterSet('validate_hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('hash'))) {
                // Validate the login data and hash
-               $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'));
+               $valid = adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'));
 
                // Valid?
                if ($valid === true) {
                        // Prepare content first
                        $content = array(
-                               'hash'  => secureString(postRequestElement('hash')),
-                               'login' => secureString(postRequestElement('login'))
+                               'hash'  => secureString(postRequestParameter('hash')),
+                               'login' => secureString(postRequestParameter('login'))
                        );
 
                        // Validation okay so display form for final password change
@@ -173,11 +173,11 @@ if (!isAdminRegistered()) {
                        // Cannot validate the login data and hash
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
                }
-       } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') == postRequestElement('pass2'))) {
+       } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
-               if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'))) {
+               if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
                        // Output result
-                       loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestElement('login'), postRequestElement('pass1')));
+                       loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
@@ -193,19 +193,19 @@ if (!isAdminRegistered()) {
                redirectToUrl('modules.php?module=admin&amp;logout=1');
        } // END - if
 
-       if (isGetRequestElementSet('register')) {
+       if (isGetRequestParameterSet('register')) {
                // Registration of first admin is done
-               if (getRequestElement('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+               if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
        } // END - if
 
        // Check if the admin has submitted data or not
-       if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) {
-               setPostRequestElement('ok', '***');
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+               setPostRequestParameter('ok', '***');
        } // END - if
 
-       if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+       if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
                // All required data was entered so we check his account
-               $ret = ifAdminLoginDataIsValid(postRequestElement('login'), postRequestElement('pass'));
+               $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
 
                // Which status do we have?
                switch ($ret) {
@@ -221,20 +221,20 @@ if (!isAdminRegistered()) {
                                // Add data to URL
                                if (isWhatSet())        $URL .= 'what='.getWhat();
                                 elseif (isActionSet()) $URL .= 'action='.getAction();
-                                elseif (isGetRequestElementSet('area'))  $URL .= 'area='.getRequestElement('area');
+                                elseif (isGetRequestParameterSet('area'))  $URL .= 'area='.getRequestParameter('area');
 
                         // Load URL
                         redirectToUrl($URL);
                         break;
 
                        case '404': // Administrator login not found
-                               setPostRequestElement('ok', $ret);
-                               $ret = getMaskedMessage('ADMIN_404', postRequestElement('login'));
+                               setPostRequestParameter('ok', $ret);
+                               $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login'));
                                destroyAdminSession();
                                break;
 
                        case 'pass': // Wrong password
-                               setPostRequestElement('ok', $ret);
+                               setPostRequestParameter('ok', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
                                break;
@@ -248,8 +248,8 @@ if (!isAdminRegistered()) {
        // Error detected?
        if ($ret != 'done') {
                $content['login'] = '';
-               if (isPostRequestElementSet('login')) {
-                       $content['login'] = postRequestElement('login');
+               if (isPostRequestParameterSet('login')) {
+                       $content['login'] = postRequestParameter('login');
                } // END - if
 
                // Init array elements
@@ -261,19 +261,19 @@ if (!isAdminRegistered()) {
                        $loginMessage = ''; $passwdMessage = '';
 
                        // No login entered?
-                       if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+                       if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestElement('ok') == '404')) $loginMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+                       if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
                        // Or password too short?
-                       if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+                       if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestElement('ok') == 'pass')) $passwdMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
 
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
@@ -292,9 +292,9 @@ if (!isAdminRegistered()) {
                                // Set default values
                                $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
                        }
-               } elseif (isGetRequestElementSet('area')) {
+               } elseif (isGetRequestParameterSet('area')) {
                        // Restore old area value
-                       $content = merge_array($content, array('target' => 'area', 'value' => getRequestElement('area')));
+                       $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area')));
                } else {
                        // Set default values
                        $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
@@ -303,19 +303,19 @@ if (!isAdminRegistered()) {
                // Load login form template
                loadTemplate('admin_login_form', false, $content);
        } // END - if
-} elseif (isGetRequestElementSet('logout')) {
+} elseif (isGetRequestParameterSet('logout')) {
        // Only try to remove cookies
        if (destroyAdminSession()) {
                // Load logout template
-               if (isGetRequestElementSet('register')) {
+               if (isGetRequestParameterSet('register')) {
                        // Secure input
-                       $register = getRequestElement('register');
+                       $register = getRequestParameter('register');
 
                        // Special logout redirect for installation of given extension
                        loadTemplate(sprintf("admin_logout_%s_install", $register));
-               } elseif (isGetRequestElementSet('remove')) {
+               } elseif (isGetRequestParameterSet('remove')) {
                        // Secure input
-                       $remove = getRequestElement('remove');
+                       $remove = getRequestParameter('remove');
 
                        // Special logout redirect for removal of given extension
                        loadTemplate(sprintf("admin_logout_%s_remove", $remove));
@@ -349,7 +349,7 @@ if (!isAdminRegistered()) {
                                $area = 'entrance';
 
                                // Check for similar URL variable
-                               if (isGetRequestElementSet('area')) $area = getRequestElement('area');
+                               if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
 
                                // Load logical-area menu-system file
                                loadIncludeOnce('inc/modules/admin/lasys-inc.php');
@@ -364,13 +364,13 @@ if (!isAdminRegistered()) {
                        break;
 
                case '404': // Administrator login not found
-                       setPostRequestElement('ok', $ret);
+                       setPostRequestParameter('ok', $ret);
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
                        destroyAdminSession();
                        break;
 
                case 'pass': // Wrong password
-                       setPostRequestElement('ok', $ret);
+                       setPostRequestParameter('ok', $ret);
                        loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
                        destroyAdminSession();
                        break;
index c8fe63d..b490b63 100644 (file)
@@ -44,10 +44,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('no')) {
+if (isPostRequestParameterSet('no')) {
        // Do not logout now
        redirectToUrl('admin.php');
-} elseif ((isPostRequestElementSet(('yes'))) && (getAction() == 'logout')) {
+} elseif ((isPostRequestParameterSet(('yes'))) && (getAction() == 'logout')) {
        // Redirect to logout link
        redirectToUrl('modules.php?module=admin&amp;logout=1');
 }
index 0f83822..66e71dc 100644 (file)
@@ -827,7 +827,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
        } // END - if
 
        // Is the raw userid set?
-       if (postRequestElement('userid_raw', $id) > 0) {
+       if (postRequestParameter('userid_raw', $id) > 0) {
                // Generate subject
                $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
 
@@ -839,7 +839,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
                }
 
                // Send email out
-               sendEmail(postRequestElement('userid_raw', $id), $subjectLine, $mail);
+               sendEmail(postRequestParameter('userid_raw', $id), $subjectLine, $mail);
        } // END - if
 
        // Generate subject
@@ -847,9 +847,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
 
        // Send admin notification out
        if (!empty($subjectPart)) {
-               sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestElement('userid_raw', $id));
+               sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter('userid_raw', $id));
        } else {
-               sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestElement('userid_raw', $id));
+               sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestParameter('userid_raw', $id));
        }
 }
 
@@ -1007,7 +1007,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct
                        $idList = '';
                        foreach ($IDs as $id => $sel) {
                                // Is there a userid?
-                               if (isPostRequestElementSet('userid_raw', $id)) {
+                               if (isPostRequestParameterSet('userid_raw', $id)) {
                                        // Load all data from that id
                                        $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
                                        array($table, $idColumn, $id), __FUNCTION__, __LINE__);
@@ -1395,7 +1395,7 @@ function doVerifyExpertSettings () {
                                // Ask for them
                                if (isFormSent()) {
                                        // Is the element set, then we need to change the admin
-                                       if (isPostRequestElementSet('expert_settings')) {
+                                       if (isPostRequestParameterSet('expert_settings')) {
                                                // Get it and prepare final post data array
                                                $postData['login'][getCurrentAdminId()] = getAdminLogin(getCurrentAdminId());
                                                $postData['expert_warning'][getCurrentAdminId()] = 'N';
@@ -1404,7 +1404,7 @@ function doVerifyExpertSettings () {
                                                adminsChangeAdminAccount($postData, 'expert_warning');
 
                                                // Clear form
-                                               unsetPostRequestElement('ok');
+                                               unsetPostRequestParameter('ok');
                                        } // END - if
 
                                        // All fine!
index 0696321..01a9b8b 100644 (file)
@@ -44,11 +44,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (getRequestElement('userid') == 'all') {
+if (getRequestParameter('userid') == 'all') {
        // Add points to all accounts
-       if ((isFormSent()) && (postRequestElement('points') > 0)) {
+       if ((isFormSent()) && (postRequestParameter('points') > 0)) {
                // Points
-               $content['points'] = bigintval(postRequestElement('points'));
+               $content['points'] = bigintval(postRequestParameter('points'));
 
                // Select all users
                $result_main = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
@@ -62,11 +62,11 @@ if (getRequestElement('userid') == 'all') {
                        $GLOBALS['ref_level'] = -1;
 
                        // Ok, add points and send an email to him...
-                       addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestElement('points')));
+                       addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestParameter('points')));
 
                        // Prepare content
-                       $content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-                       $content['points'] = bigintval(postRequestElement('points'));
+                       $content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
+                       $content['points'] = bigintval(postRequestParameter('points'));
 
                        // Load email template and send email away
                        $message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
@@ -82,38 +82,38 @@ if (getRequestElement('userid') == 'all') {
                // Display form add points
                loadTemplate('admin_add_points_all');
        }
-} elseif (isGetRequestElementSet('userid')) {
+} elseif (isGetRequestParameterSet('userid')) {
        // User id found in URL so we use this give him some credits
-       if (fetchUserData(getRequestElement('userid'))) {
+       if (fetchUserData(getRequestParameter('userid'))) {
                // Selected user does exist
                $content = getUserDataArray();
 
-               if ((isFormSent()) && (isPostRequestElementSet('points'))) {
+               if ((isFormSent()) && (isPostRequestParameterSet('points'))) {
                        // Add points and send an email to him...
-                       addPointsDirectly('admin_single', bigintval(getRequestElement('userid')), bigintval(postRequestElement('points')));
+                       addPointsDirectly('admin_single', bigintval(getRequestParameter('userid')), bigintval(postRequestParameter('points')));
 
                        // Prepare content
                        $content = array(
-                               'text'   => SQL_ESCAPE(postRequestElement('reason')),
-                               'points' => bigintval(postRequestElement('points'))
+                               'text'   => SQL_ESCAPE(postRequestParameter('reason')),
+                               'points' => bigintval(postRequestParameter('points'))
                        );
 
                        // Message laden
-                       $message = loadEmailTemplate('add-points', $content, bigintval(getRequestElement('userid')));
+                       $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
 
-                       sendEmail(bigintval(getRequestElement('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
+                       sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
                } else {
                        // Prepare content
                        $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
-                       $content['userid'] = bigintval(getRequestElement('userid'));
+                       $content['userid'] = bigintval(getRequestParameter('userid'));
 
                        // Output template
                        loadTemplate('admin_add_points', false, $content);
                }
        } else {
                // User not found!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
        }
 } else {
        // Output selection form with all confirmed user accounts listed
index 1d7c7d6..3435eba 100644 (file)
@@ -46,8 +46,8 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Generate timestamps
-       $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')  );
+       $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')  );
 
        // 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",
@@ -59,19 +59,19 @@ if (isFormSent()) {
 VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
                        array(
                                getCurrentAdminId(),
-                               postRequestElement('title'),
-                               postRequestElement('descr'),
-                               postRequestElement('template'),
+                               postRequestParameter('title'),
+                               postRequestParameter('descr'),
+                               postRequestParameter('template'),
                                $START,
                                $END,
-                               postRequestElement('auto_add'),
-                               postRequestElement('active'),
-                               postRequestElement('notify'),
+                               postRequestParameter('auto_add'),
+                               postRequestParameter('active'),
+                               postRequestParameter('notify'),
                        ), __FILE__, __LINE__);
 
                // Load id
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND `title`='%s' LIMIT 1",
-               array($START, $END, postRequestElement('title')), __FILE__, __LINE__);
+               array($START, $END, postRequestParameter('title')), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
index fc01349..ba0f6ca 100644 (file)
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Was an URL added?
-if ((isPostRequestElementSet('add')) && (isPostRequestElementSet('url'))) {
+if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet('url'))) {
        // Initialize variables
        $DATA = array();
        $id = 'reload_ye';
@@ -53,7 +53,7 @@ if ((isPostRequestElementSet('add')) && (isPostRequestElementSet('url'))) {
        $postData = postRequestArray();
 
        // Convert the "reload selections"
-       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestElement() calls to $postData
+       // @TODO Find all convertSelectionsToTimestamp() calls and rewrite postRequestParameter() calls to $postData
        convertSelectionsToTimestamp($postData, $DATA, $id, $skip);
 
        // Then add this URL
index 4f3f661..272d4bd 100644 (file)
@@ -45,8 +45,8 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((!isPostRequestElementSet('title')) || (!isPostRequestElementSet('menu')) || (!isPostRequestElementSet(('descr')))) && (isFormSent())) {
-       unsetPostRequestElement('ok');
+if (((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu')) || (!isPostRequestParameterSet(('descr')))) && (isFormSent())) {
+       unsetPostRequestParameter('ok');
 } // END - if
 
 if (!isFormSent()) {
@@ -163,25 +163,25 @@ if (!isFormSent()) {
        loadTemplate('admin_admin_add', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
-       if (isPostRequestElementSet('menu')) {
+       if (isPostRequestParameterSet('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(
-                               postRequestElement('menu'),
-                               postRequestElement('name'),
-                               postRequestElement('title'),
-                               postRequestElement('descr'),
-                               bigintval(postRequestElement('sort')),
+                               postRequestParameter('menu'),
+                               postRequestParameter('name'),
+                               postRequestParameter('title'),
+                               postRequestParameter('descr'),
+                               bigintval(postRequestParameter('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(
-                               postRequestElement('name'),
-                               postRequestElement('title'),
-                               postRequestElement('descr'),
-                               bigintval(postRequestElement('sort')),
+                               postRequestParameter('name'),
+                               postRequestParameter('title'),
+                               postRequestParameter('descr'),
+                               bigintval(postRequestParameter('sort')),
                        ), __FILE__, __LINE__
                );
        }
index de04b2d..f2db403 100644 (file)
@@ -46,19 +46,19 @@ addMenuDescription('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
-if (isGetRequestElementSet('sub')) {
-       $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestElement('sub'));
-       $SUB = getRequestElement('sub');
+if (isGetRequestParameterSet('sub')) {
+       $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+       $SUB = getRequestParameter('sub');
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Edit menu entries
        // @TODO Kill all constants in this file
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
        $cnt = '0'; $SW = 2;
-       foreach (postRequestElement('sel') as $sel => $confirm) {
+       foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what`, `descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -102,14 +102,14 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 
        // Load template
        loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
 
        // Del menu entries with or without confirmation
        $SW = 2; $cnt = '0'; $OUT = '';
-       foreach (postRequestElement('sel') as $sel => $confirm) {
+       foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -145,9 +145,9 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
        loadTemplate('admin_amenu_delete', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An action is done...
-       switch (postRequestElement('ok')) {
+       switch (postRequestParameter('ok')) {
                case 'edit': // Edit menu
-                       foreach (postRequestElement('sel') as $sel => $menu) {
+                       foreach (postRequestParameter('sel') as $sel => $menu) {
                                // Secure id
                                $sel = bigintval($sel);
 
@@ -160,9 +160,9 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                $menu,
-                               postRequestElement('sel_action', $sel),
-                               postRequestElement('sel_what', $sel),
-                               postRequestElement('sel_desc', $sel),
+                               postRequestParameter('sel_action', $sel),
+                               postRequestParameter('sel_what', $sel),
+                               postRequestParameter('sel_desc', $sel),
                                $sel,
                                ), __FILE__, __LINE__);
                        }
@@ -172,7 +172,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        break;
 
                case 'del': // Delete menu
-                       foreach (postRequestElement('sel') as $sel => $menu) {
+                       foreach (postRequestParameter('sel') as $sel => $menu) {
                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
                                        array(bigintval($sel)), __FILE__, __LINE__);
                        } // END - foreach
@@ -182,31 +182,31 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        break;
 
                default: // Unexpected action
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
-                       loadTemplate('admin_menu_unknown_okay', false, postRequestElement('ok'));
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+                       loadTemplate('admin_menu_unknown_okay', false, postRequestParameter('ok'));
                        break;
        }
 } else {
-       if ((isGetRequestElementSet(('act'))) && (isGetRequestElementSet(('tid'))) && (isGetRequestElementSet(('fid')))) {
+       if ((isGetRequestParameterSet(('act'))) && (isGetRequestParameterSet(('tid'))) && (isGetRequestParameterSet(('fid')))) {
                // Get ids
-               if (isGetRequestElementSet(('w'))) {
+               if (isGetRequestParameterSet(('w'))) {
                        // Sub menus selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                       array(getRequestElement('act'), bigintval(getRequestElement('tid'))), __FILE__, __LINE__);
+                       array(getRequestParameter('act'), bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                       array(getRequestElement('act'), bigintval(getRequestElement('fid'))), __FILE__, __LINE__);
+                       array(getRequestParameter('act'), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                       array(bigintval(getRequestElement('tid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                       array(bigintval(getRequestElement('fid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
@@ -214,9 +214,9 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-                               array(bigintval(getRequestElement('tid')), bigintval($fid)), __FILE__, __LINE__);
+                               array(bigintval(getRequestParameter('tid')), bigintval($fid)), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-                               array(bigintval(getRequestElement('fid')), bigintval($tid)), __FILE__, __LINE__);
+                               array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
                }
        }
 
index 6bb5901..7278859 100644 (file)
@@ -47,9 +47,9 @@ addMenuDescription('admin', __FILE__);
 // Display form is default
 $FORM = true;
 
-if ((isPostRequestElementSet('add')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('email')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')) && (postRequestElement('pass1') == postRequestElement('pass2'))) {
+if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('email')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
        // Add admin when not added already
-       if (addAdminAccount(postRequestElement('login'), generateHash(postRequestElement('pass1')), postRequestElement('email')) == 'done') {
+       if (addAdminAccount(postRequestParameter('login'), generateHash(postRequestParameter('pass1')), postRequestParameter('email')) == 'done') {
                // Do not ouput any form!
                $FORM = false;
 
index 6a5b66f..75d8c2f 100644 (file)
@@ -44,26 +44,26 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if ((isFormSent()) && (isGetRequestElementSet('admin'))) {
+if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
        // Send mail or message
-       if ((isExtensionActive('msg')) && (postRequestElement('type') == 'message')) {
+       if ((isExtensionActive('msg')) && (postRequestParameter('type') == 'message')) {
                // Add message
-               $message = loadEmailTemplate('admins_msg_contct_admin', postRequestElement('text'), 0);
-               sendAdminMessage(getRequestElement('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
+               $message = loadEmailTemplate('admins_msg_contct_admin', postRequestParameter('text'), 0);
+               sendAdminMessage(getRequestParameter('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
        } else {
                // Load admin's email address
-               $email = getAdminEmail(bigintval(getRequestElement('admin')));
+               $email = getAdminEmail(bigintval(getRequestParameter('admin')));
 
                // Load email template and send the mail to the admin
-               $message = loadEmailTemplate('admins_mail_contct_admin', postRequestElement('text'), 0);
+               $message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
                sendEmail($email, getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
        }
 
        // Mail / message dropped
        loadTemplate('admin_settings_saved', false, getMessage('ADMINS_ADMIN_CONTACTED'));
-} elseif (isGetRequestElementSet('admin')) {
+} elseif (isGetRequestParameterSet('admin')) {
        // Load contact form template
-       $content['admin'] = getRequestElement('admin');
+       $content['admin'] = getRequestParameter('admin');
 
        if (isExtensionActive('msg')) {
                // Add option to select between mail and message
index d87edee..33cc174 100644 (file)
@@ -45,29 +45,29 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Set selection data to empty array when it is empty
-if (!isPostRequestElementSet('sel')) setPostRequestElement('sel', array());
+if (!isPostRequestParameterSet('sel')) setPostRequestParameter('sel', array());
 
 // Check if direct admin account was selected
-if (isGetRequestElementSet('admin')) {
+if (isGetRequestParameterSet('admin')) {
        // Secure id number
-       $adminId = bigintval(getRequestElement('admin'));
+       $adminId = bigintval(getRequestParameter('admin'));
 
        // Set required fields
-       setPostRequestElement('edit', 1);
-       setPostRequestElement('sel', array($adminId => 1));
+       setPostRequestParameter('edit', 1);
+       setPostRequestParameter('sel', array($adminId => 1));
 } // END - if
 
-if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
        // Edit account(s)
        adminsEditAdminAccount(postRequestArray());
-} elseif ((isPostRequestElementSet('change')) && (count(postRequestElement('login')) > 0)) {
+} elseif ((isPostRequestParameterSet('change')) && (count(postRequestParameter('login')) > 0)) {
        // Change admin accounts
        adminsChangeAdminAccount(postRequestArray());
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
        // Show admin accounts for deletetion
        adminsDeleteAdminAccount(postRequestArray());
 } else {
-       if ((isPostRequestElementSet('remove')) && (countPostSelection() > 0)) {
+       if ((isPostRequestParameterSet('remove')) && (countPostSelection() > 0)) {
                // Remove accounts now
                adminsRemoveAdminAccount(postRequestArray());
        } // END - if
index 995060b..86f906e 100644 (file)
@@ -44,13 +44,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('edit')) {
+if (isPostRequestParameterSet('edit')) {
        // Check if entires are checked
        if (countPostSelection() > 0) {
                // Add option for events
                $adminsList = generateOptionList('admins', 'id', 'login', '', 'email');
                $SW = 2; $rows = '';
-               foreach (postRequestElement('sel') as $template => $sel) {
+               foreach (postRequestParameter('sel') as $template => $sel) {
                        // First of all load data from DB
                        $result = SQL_QUERY_ESC("SELECT `admin_id`, `id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `id` ASC",
                                array($template), __FILE__, __LINE__);
@@ -121,12 +121,12 @@ ORDER BY
 
        if (SQL_NUMROWS($result) > 0) {
                // Shall I change entries?
-               if (isPostRequestElementSet('change')) {
+               if (isPostRequestParameterSet('change')) {
                        // Init SQLs
                        initSqls();
 
                        // Ok, update database
-                       foreach (postRequestElement('admin_id') as $id => $content['admin_id']) {
+                       foreach (postRequestParameter('admin_id') as $id => $content['admin_id']) {
                                // Secure ids
                                $id  = bigintval($id);
                                $content['admin_id'] = bigintval($content['admin_id']);
@@ -135,16 +135,16 @@ ORDER BY
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET admin_id=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
                                        array($content['admin_id'], $id), __FILE__, __LINE__, false));
 
-                               if (($content['admin_id'] < 1) && (isPostRequestElementSet('template', $id))) {
+                               if (($content['admin_id'] < 1) && (isPostRequestParameterSet('template', $id))) {
                                        // Remove any other admin entries
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
-                                       array(postRequestElement('template', $id), $id), __FILE__, __LINE__, false));
+                                       array(postRequestParameter('template', $id), $id), __FILE__, __LINE__, false));
                                } // END - if
 
-                               if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
+                               if (postRequestParameter('admin_new', postRequestParameter('template', $id)) > 0) {
                                        // Add new admin
                                        addSql(SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
-                                       array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, false));
+                                       array($content['admin_id'], postRequestParameter('template', $id)), __FILE__, __LINE__, false));
                                } // END - if
                        } // END - foreach
 
index b5c0af2..0391c25 100644 (file)
@@ -44,10 +44,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
        // Edit ACLs
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $selected) {
+       foreach (postRequestParameter('sel') as $id => $selected) {
                // Load data for the id
                $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
@@ -79,19 +79,19 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
 
        // Load main template
        loadTemplate('admin_config_admins_edit', false, $OUT);
-} elseif ((isPostRequestElementSet('change')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('change')) && (countPostSelection() > 0)) {
        // Change entries
-       foreach (postRequestElement('sel') as $id => $selected) {
+       foreach (postRequestParameter('sel') as $id => $selected) {
                // Secure id
                $id = bigintval($id);
 
                // Update entries
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_acls` SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE `id`=%s LIMIT 1",
                array(
-                       postRequestElement('admin', $id),
-                       postRequestElement('action_menu', $id),
-                       postRequestElement('what_menu', $id),
-                       postRequestElement('mode', $id),
+                       postRequestParameter('admin', $id),
+                       postRequestParameter('action_menu', $id),
+                       postRequestParameter('what_menu', $id),
+                       postRequestParameter('mode', $id),
                        $id
                ),__FILE__, __LINE__);
        } // END - foreach
@@ -103,10 +103,10 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
 
        // Entries changed
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
        // Delete ACLs
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $selected) {
+       foreach (postRequestParameter('sel') as $id => $selected) {
                // Load data for the id
                $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
@@ -140,10 +140,10 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
 
        // Load main template
        loadTemplate('admin_config_admins_del', false, $OUT);
-} elseif ((isPostRequestElementSet('remove')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('remove')) && (countPostSelection() > 0)) {
        // Remove entries
        // @TODO Rewrite this to filter 'run_sqls'
-       foreach (postRequestElement('sel') as $id => $selected) {
+       foreach (postRequestParameter('sel') as $id => $selected) {
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)),__FILE__, __LINE__);
        } // END - foreach
@@ -155,33 +155,33 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
 
        // Entries deleted
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));
-} elseif (isPostRequestElementSet('add')) {
+} elseif (isPostRequestParameterSet('add')) {
        // Check if everything is fine...
-       $mode = getAdminDefaultAcl(bigintval(postRequestElement('admin_id')));
+       $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));
 
        // Default ACL is false
        $ACL = false;
-       if (isPostRequestElementSet('what_menu')) {
+       if (isPostRequestParameterSet('what_menu')) {
                // Check parent ACL
-               $ACL = adminsCheckAdminAcl(getModeAction('admin', postRequestElement('what_menu')), '');
+               $ACL = adminsCheckAdminAcl(getModeAction('admin', postRequestParameter('what_menu')), '');
        } // END - if
 
-       if (($mode != postRequestElement('mode')) || ($ACL)) {
+       if (($mode != postRequestParameter('mode')) || ($ACL)) {
                // Mode is fine
-               $BOTH = ((isPostRequestElementSet('action_menu')) && (isPostRequestElementSet('what_menu')));
-               if (((isPostRequestElementSet('action_menu')) || (isPostRequestElementSet('what_menu'))) && ($BOTH === false)) {
+               $BOTH = ((isPostRequestParameterSet('action_menu')) && (isPostRequestParameterSet('what_menu')));
+               if (((isPostRequestParameterSet('action_menu')) || (isPostRequestParameterSet('what_menu'))) && ($BOTH === false)) {
                        // Main or sub menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE admin_id=%s AND action_menu='%s' AND what_menu='%s' LIMIT 1",
-                               array(bigintval(postRequestElement('admin_id')), postRequestElement('action_menu'), postRequestElement('what_menu')), __FILE__, __LINE__);
+                               array(bigintval(postRequestParameter('admin_id')), postRequestParameter('action_menu'), postRequestParameter('what_menu')), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == '0') {
                                // Finally add the new ACL
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (admin_id, action_menu, what_menu, access_mode)
 VALUES ('%s','%s','%s','%s')",
                                array(
-                                       bigintval(postRequestElement('admin_id')),
-                                       postRequestElement('action_menu'),
-                                       postRequestElement('what_menu'),
-                                       postRequestElement('mode')
+                                       bigintval(postRequestParameter('admin_id')),
+                                       postRequestParameter('action_menu'),
+                                       postRequestParameter('what_menu'),
+                                       postRequestParameter('mode')
                                ), __FILE__, __LINE__);
                                $content = getMessage('ADMIN_ADMINS_ACL_SAVED');
 
index 91e66e9..8fc4128 100644 (file)
@@ -46,17 +46,17 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Translate german decimal commas to computer decimal dots
-       setPostRequestElement('beg_points'      , convertCommaToDot(postRequestElement('beg_points')      ));
-       setPostRequestElement('beg_points_max'  , convertCommaToDot(postRequestElement('beg_points_max')  ));
-       setPostRequestElement('beg_notify_bonus', convertCommaToDot(postRequestElement('beg_notify_bonus')));
+       setPostRequestParameter('beg_points'      , convertCommaToDot(postRequestParameter('beg_points')      ));
+       setPostRequestParameter('beg_points_max'  , convertCommaToDot(postRequestParameter('beg_points_max')  ));
+       setPostRequestParameter('beg_notify_bonus', convertCommaToDot(postRequestParameter('beg_notify_bonus')));
 
        // Save settings
        adminSaveSettingsFromPostData();
 
        // Remember new settings
-       setConfigEntry('beg_rallye'       , postRequestElement('beg_rallye'));
-       setConfigEntry('beg_ral_en_notify', postRequestElement('beg_ral_en_notify'));
-       setConfigEntry('beg_ral_di_notify', postRequestElement('beg_ral_di_notify'));
+       setConfigEntry('beg_rallye'       , postRequestParameter('beg_rallye'));
+       setConfigEntry('beg_ral_en_notify', postRequestParameter('beg_ral_en_notify'));
+       setConfigEntry('beg_ral_di_notify', postRequestParameter('beg_ral_di_notify'));
 } else {
        // Prepare constants for the template
        $content['points']           = translateComma(getConfig('beg_points')      , false);
index 7d7b6dc..0372884 100644 (file)
@@ -46,32 +46,32 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Replace german decimal commas to computer decimal dots
-       setPostRequestElement('login_bonus',         convertCommaToDot(postRequestElement('login_bonus')));
-       setPostRequestElement('turbo_bonus',         convertCommaToDot(postRequestElement('turbo_bonus')));
-       setPostRequestElement('bonus_ref',           convertCommaToDot(postRequestElement('bonus_ref')));
-       setPostRequestElement('bonus_order',         convertCommaToDot(postRequestElement('bonus_order')));
-       setPostRequestElement('bonus_notify_points', convertCommaToDot(postRequestElement('bonus_notify_points')));
+       setPostRequestParameter('login_bonus',         convertCommaToDot(postRequestParameter('login_bonus')));
+       setPostRequestParameter('turbo_bonus',         convertCommaToDot(postRequestParameter('turbo_bonus')));
+       setPostRequestParameter('bonus_ref',           convertCommaToDot(postRequestParameter('bonus_ref')));
+       setPostRequestParameter('bonus_order',         convertCommaToDot(postRequestParameter('bonus_order')));
+       setPostRequestParameter('bonus_notify_points', convertCommaToDot(postRequestParameter('bonus_notify_points')));
 
        // Generate string for saving ranks
-       setPostRequestElement('turbo_rates', '');
+       setPostRequestParameter('turbo_rates', '');
        $RATES = array();
-       foreach (postRequestElement('rate') as $rate) {
+       foreach (postRequestParameter('rate') as $rate) {
                $rate = trim(convertCommaToDot($rate));
                if (!empty($rate)) $RATES[] = $rate;
        }
-       setPostRequestElement('turbo_rates', trim(implode(';', $RATES)));
-       unsetPostRequestElement('rate');
+       setPostRequestParameter('turbo_rates', trim(implode(';', $RATES)));
+       unsetPostRequestParameter('rate');
 
        // Automatically calculate bonus points for ranks 2 and 3 when not set
-       if (!isPostRequestElementSet('turbo_rates')) setPostRequestElement('turbo_rates', ''.round(getConfig('turbo_bonus') / 2).';'.round(getConfig('turbo_bonus') / 4).'');
+       if (!isPostRequestParameterSet('turbo_rates')) setPostRequestParameter('turbo_rates', ''.round(getConfig('turbo_bonus') / 2).';'.round(getConfig('turbo_bonus') / 4).'');
 
        // Save data
        adminSaveSettingsFromPostData();
 
        // Remember new settings
-       setConfigEntry('bonus_active'   , postRequestElement('bonus_active'));
-       setConfigEntry('bonus_en_notify', postRequestElement('bonus_en_notify'));
-       setConfigEntry('bonus_di_notify', postRequestElement('bonus_di_notify'));
+       setConfigEntry('bonus_active'   , postRequestParameter('bonus_active'));
+       setConfigEntry('bonus_en_notify', postRequestParameter('bonus_en_notify'));
+       setConfigEntry('bonus_di_notify', postRequestParameter('bonus_di_notify'));
 } else {
        // Prepare contants for the template
        $content['login']  = translateComma(getConfig('login_bonus')        , false);
index 96b8cfd..bcb2d4a 100644 (file)
@@ -48,17 +48,17 @@ addMenuDescription('admin', __FILE__);
 // Init variable to avoid a notice
 $CATS = '';
 
-if (isPostRequestElementSet('add')) {
+if (isPostRequestParameterSet('add')) {
        // Add a new category
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1",
-               array(postRequestElement('catname')), __FILE__, __LINE__);
+               array(postRequestParameter('catname')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == '0') {
                // Category does not exists, we simply add it...
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('%s','%s','%s')",
                        array(
-                               postRequestElement('catname'),
-                               postRequestElement('visible'),
-                               bigintval(postRequestElement('parent') + 1)
+                               postRequestParameter('catname'),
+                               postRequestParameter('visible'),
+                               bigintval(postRequestParameter('parent') + 1)
                        ), __FILE__, __LINE__);
                $content = getMessage('CATEGORY_ADDED');
        } else {
@@ -71,22 +71,22 @@ if (isPostRequestElementSet('add')) {
 
        // Display message
        loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isPostRequestElementSet('id')) && (is_array(postRequestElement('id')))) {
+} elseif ((isFormSent()) && (isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))) {
        // Change or delete categories...
        $TEXT = '';
-       foreach (postRequestElement('id') as $id => $cat) {
+       foreach (postRequestParameter('id') as $id => $cat) {
                // Secure id
                $id = bigintval($id);
 
                // Is the entry set?
                if (!empty($cat)) {
-                       switch (getRequestElement('do')) {
+                       switch (getRequestParameter('do')) {
                                case 'edit': // Change categories
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s', `visible`='%s', `sort`=%s WHERE `id`=%s LIMIT 1",
                                                array(
                                                        $cat,
-                                                       postRequestElement('vis', $id),
-                                                       postRequestElement('sort', $id),
+                                                       postRequestParameter('vis', $id),
+                                                       postRequestParameter('sort', $id),
                                                        $id
                                                ), __FILE__, __LINE__);
                                        $TEXT = getMessage('CATEGORIES_SAVED');
@@ -110,10 +110,10 @@ if (isPostRequestElementSet('add')) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
        // Delete categories
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       foreach (postRequestParameter('sel') as $id => $value) {
                // Load data of category
                $result = SQL_QUERY_ESC("SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
@@ -136,10 +136,10 @@ if (isPostRequestElementSet('add')) {
 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
        // Edit categories
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       foreach (postRequestParameter('sel') as $id => $value) {
                // Load data from the category
                $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FILE__, __LINE__);
index a05621c..32f0624 100644 (file)
@@ -46,11 +46,11 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Replace commata with decimal dot
-       setPostRequestElement('doubler_charge', (convertCommaToDot(postRequestElement('doubler_charge')) / 100));
-       setPostRequestElement('doubler_ref'   , (convertCommaToDot(postRequestElement('doubler_ref')) / 100));
-       setPostRequestElement('doubler_min'   , convertCommaToDot(postRequestElement('doubler_min')));
-       setPostRequestElement('doubler_max'   , convertCommaToDot(postRequestElement('doubler_max')));
-       setPostRequestElement('doubler_left'  , convertCommaToDot(postRequestElement('doubler_left')));
+       setPostRequestParameter('doubler_charge', (convertCommaToDot(postRequestParameter('doubler_charge')) / 100));
+       setPostRequestParameter('doubler_ref'   , (convertCommaToDot(postRequestParameter('doubler_ref')) / 100));
+       setPostRequestParameter('doubler_min'   , convertCommaToDot(postRequestParameter('doubler_min')));
+       setPostRequestParameter('doubler_max'   , convertCommaToDot(postRequestParameter('doubler_max')));
+       setPostRequestParameter('doubler_left'  , convertCommaToDot(postRequestParameter('doubler_left')));
 
        // Save settings
        adminSaveSettingsFromPostData();
index 1a2fc7f..789a1ec 100644 (file)
@@ -45,16 +45,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Remove empty array index
-if (!isPostRequestElementSet(('max'))) unsetPostRequestElement(('add_max'));
+if (!isPostRequestParameterSet(('max'))) unsetPostRequestParameter(('add_max'));
 
-if (isPostRequestElementSet(('add_max'))) {
+if (isPostRequestParameterSet(('add_max'))) {
        // Save all settings
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='%s' LIMIT 1",
-       array(bigintval(postRequestElement('max'))), __FILE__, __LINE__);
+       array(bigintval(postRequestParameter('max'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == '0') {
                // Add this value (including comment)
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('%s','%s')",
-               array(bigintval(postRequestElement('max')), postRequestElement('comment')),__FILE__, __LINE__);
+               array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
                $content = getMessage('MAX_VALUE_SAVED');
        } else {
                // Value does alread exists!
@@ -66,20 +66,20 @@ if (isPostRequestElementSet(('add_max'))) {
 
        // Display message
        loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isGetRequestElementSet('do'))) {
+} elseif ((isFormSent()) && (isGetRequestParameterSet('do'))) {
        // Change or delete entries...
        $TEXT = '';
-       foreach (postRequestElement('id') as $id => $value) {
+       foreach (postRequestParameter('id') as $id => $value) {
                // Secure id
                $id = bigintval($id);
 
-               switch (getRequestElement('do'))
+               switch (getRequestParameter('do'))
                {
                        case 'edit': // Change entries
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_max_receive` SET value='%s', comment='%s' WHERE `id`=%s LIMIT 1",
                                array(
-                                       bigintval(postRequestElement('val', $id)),
-                                       postRequestElement('comm', $id),
+                                       bigintval(postRequestParameter('val', $id)),
+                                       postRequestParameter('comm', $id),
                                        $id
                                ),__FILE__, __LINE__);
                                $TEXT = getMessage('MRECEIVE_SAVED');
@@ -97,10 +97,10 @@ if (isPostRequestElementSet(('add_max'))) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
        // Delete entries
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       foreach (postRequestParameter('sel') as $id => $value) {
                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FILE__, __LINE__);
@@ -123,10 +123,10 @@ if (isPostRequestElementSet(('add_max'))) {
 
        // Load main template
        loadTemplate('admin_config_email_del', false, $content);
-} elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
        // Edit entries
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       foreach (postRequestParameter('sel') as $id => $value) {
                // Load data
                $result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
                array(bigintval($id)), __FILE__, __LINE__);
index 91d31bc..106ed65 100644 (file)
@@ -46,7 +46,7 @@ addMenuDescription('admin', __FILE__);
 
 // Init 'sub' value
 $sub = '';
-if (isGetRequestElementSet('sub')) $sub = getRequestElement('sub');
+if (isGetRequestParameterSet('sub')) $sub = getRequestParameter('sub');
 
 switch ($sub) {
        case 'settings': // Settings related to the index page
@@ -70,9 +70,9 @@ switch ($sub) {
                break;
 
        case 'target': // Set which what-file will be placed in home-page (only modules.php?module=index)
-               if (isGetRequestElementSet(('home'))) {
+               if (isGetRequestParameterSet(('home'))) {
                        // Set new home
-                       updateConfiguration('index_home', getRequestElement(('home')));
+                       updateConfiguration('index_home', getRequestParameter(('home')));
                } // END - if
 
                // Load all what menu points
index c077aa4..c4675ab 100644 (file)
@@ -46,25 +46,25 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Test timestamp
-       $STAMP = mktime(0, 0, 0, bigintval(postRequestElement('month')), bigintval(postRequestElement('day')), bigintval(postRequestElement('year')));
+       $STAMP = mktime(0, 0, 0, bigintval(postRequestParameter('month')), bigintval(postRequestParameter('day')), bigintval(postRequestParameter('year')));
        if ($STAMP > time()) {
                // Date is in the future!
-               unsetPostRequestElement('ok');
+               unsetPostRequestParameter('ok');
        } else {
                // Remove entries
-               unsetPostRequestElement('day');
-               unsetPostRequestElement('month');
-               unsetPostRequestElement('year');
+               unsetPostRequestParameter('day');
+               unsetPostRequestParameter('month');
+               unsetPostRequestParameter('year');
 
                // Remember timestamp
-               setPostRequestElement('mt_start', $STAMP);
+               setPostRequestParameter('mt_start', $STAMP);
        }
 
        // Convert some data
-       setPostRequestElement('mt_stage', bigintval(postRequestElement('mt_stage')));
-       if (postRequestElement('mt_stage') <= countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true)) {
+       setPostRequestParameter('mt_stage', bigintval(postRequestParameter('mt_stage')));
+       if (postRequestParameter('mt_stage') <= countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true)) {
                // Not enougth!
-               unsetPostRequestElement('ok');
+               unsetPostRequestParameter('ok');
        }
 }
 
index fe79655..a846a35 100644 (file)
@@ -44,14 +44,14 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('edit')) {
+if (isPostRequestParameterSet('edit')) {
        // Check if at least one module is selected
        if (countPostSelection() > 0) {
                // Output header
                $OUT = ''; $SW = 2;
 
                // Edit selected modules
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Load module data
                        // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function
                        $result = SQL_QUERY_ESC("SELECT `module`, `title`, `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `id`=%s LIMIT 1",
@@ -86,26 +86,26 @@ if (isPostRequestElementSet('edit')) {
                loadTemplate('admin_settings_saved', false, getMessage('MODS_NOTHING_SELECTED'));
 
                // Remove maybe confusing data
-               unsetPostRequestElement('edit');
-               unsetPostRequestElement('change');
+               unsetPostRequestParameter('edit');
+               unsetPostRequestParameter('change');
        }
-} elseif (isPostRequestElementSet('change')) {
+} elseif (isPostRequestParameterSet('change')) {
        // Init SQLs
        initSqls();
 
        // Change modules
-       foreach (postRequestElement('sel') as $id => $sel) {
+       foreach (postRequestParameter('sel') as $id => $sel) {
                // Secure id number
                $id = bigintval($id);
 
                // Update module
                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `title`='%s', `locked`='%s', `hidden`='%s', `admin_only`='%s', `mem_only`='%s' WHERE `id`=%s LIMIT 1",
                        array(
-                               postRequestElement('title', $id),
-                               postRequestElement('locked', $id),
-                               postRequestElement('hidden', $id),
-                               postRequestElement('admin', $id),
-                               postRequestElement('member', $id),
+                               postRequestParameter('title', $id),
+                               postRequestParameter('locked', $id),
+                               postRequestParameter('hidden', $id),
+                               postRequestParameter('admin', $id),
+                               postRequestParameter('member', $id),
                                $id
                        ),  __FILE__, __LINE__, false));
        }
index 67ee4e0..45aea71 100644 (file)
@@ -53,25 +53,25 @@ if (!isExtensionActive('other')) {
 // Stop saving data if one input field is !isset
 if (isFormSent()) {
        // Calculate stamps and set calculated stamps
-       setPostRequestElement('online_timeout'       , createTimestampFromSelections('ip_timeout'           , postRequestArray()));
-       setPostRequestElement('url_tlock'            , createTimestampFromSelections('url_tlock'            , postRequestArray()));
-       setPostRequestElement('profile_lock'         , createTimestampFromSelections('profile_lock'         , postRequestArray()));
-       setPostRequestElement('profile_update'       , createTimestampFromSelections('profile_update'       , postRequestArray()));
-       setPostRequestElement('resend_profile_update', createTimestampFromSelections('resend_profile_update', postRequestArray()));
+       setPostRequestParameter('online_timeout'       , createTimestampFromSelections('ip_timeout'           , postRequestArray()));
+       setPostRequestParameter('url_tlock'            , createTimestampFromSelections('url_tlock'            , postRequestArray()));
+       setPostRequestParameter('profile_lock'         , createTimestampFromSelections('profile_lock'         , postRequestArray()));
+       setPostRequestParameter('profile_update'       , createTimestampFromSelections('profile_update'       , postRequestArray()));
+       setPostRequestParameter('resend_profile_update', createTimestampFromSelections('resend_profile_update', postRequestArray()));
 
        // Online-Timeout shall be > 0 or your database will crow and crow and crow...
-       if (!isPostRequestElementSet('online_timeout'))        { unsetPostRequestElement('ok'); }
+       if (!isPostRequestParameterSet('online_timeout'))        { unsetPostRequestParameter('ok'); }
 
        // Chedck other timestamps (which can be zero!)
-       if (!isPostRequestElementSet('profile_lock'))          { unsetPostRequestElement('ok'); }
-       if (!isPostRequestElementSet('url_tlock'))             { unsetPostRequestElement('ok'); }
-       if (!isPostRequestElementSet('profile_update'))        { unsetPostRequestElement('ok'); }
-       if (!isPostRequestElementSet('resend_profile_update')) { unsetPostRequestElement('ok'); }
+       if (!isPostRequestParameterSet('profile_lock'))          { unsetPostRequestParameter('ok'); }
+       if (!isPostRequestParameterSet('url_tlock'))             { unsetPostRequestParameter('ok'); }
+       if (!isPostRequestParameterSet('profile_update'))        { unsetPostRequestParameter('ok'); }
+       if (!isPostRequestParameterSet('resend_profile_update')) { unsetPostRequestParameter('ok'); }
 
        // Check other settings
-       if (!isPostRequestElementSet('max_send'))              { unsetPostRequestElement('ok'); }
-       if (!isPostRequestElementSet('code_length'))           { unsetPostRequestElement('ok'); }
-       if (!isPostRequestElementSet('reject_url'))            { unsetPostRequestElement('ok'); }
+       if (!isPostRequestParameterSet('max_send'))              { unsetPostRequestParameter('ok'); }
+       if (!isPostRequestParameterSet('code_length'))           { unsetPostRequestParameter('ok'); }
+       if (!isPostRequestParameterSet('reject_url'))            { unsetPostRequestParameter('ok'); }
 }
 
 if (isFormSent()) {
index 3ffb231..71c3fb5 100644 (file)
@@ -44,28 +44,28 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('rate')) setPostRequestElement('rate', convertCommaToDot(postRequestElement('rate')));
+if (isPostRequestParameterSet('rate')) setPostRequestParameter('rate', convertCommaToDot(postRequestParameter('rate')));
 
-if ((isPostRequestElementSet('add')) && (isPostRequestElementSet('title')) && (postRequestElement('rate') > 0)) {
+if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet('title')) && (postRequestParameter('rate') > 0)) {
        // Add new payout type
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE type='%s' LIMIT 1",
-       array(postRequestElement('title')), __FILE__, __LINE__);
+       array(postRequestParameter('title')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == '0') {
                // Add now
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_payout_types`
 (type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)
 VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
                array(
-                       postRequestElement('title'),
-                       bigintval(postRequestElement('rate')),
-                       bigintval(postRequestElement('min_points')),
-                       postRequestElement('yacc'),
-                       postRequestElement('ypass'),
-                       postRequestElement('yurl'),
-                       postRequestElement('yrdone'),
-                       postRequestElement('yrfailed'),
-                       postRequestElement('ytrans'),
-                       postRequestElement('allow_url'),
+                       postRequestParameter('title'),
+                       bigintval(postRequestParameter('rate')),
+                       bigintval(postRequestParameter('min_points')),
+                       postRequestParameter('yacc'),
+                       postRequestParameter('ypass'),
+                       postRequestParameter('yurl'),
+                       postRequestParameter('yrdone'),
+                       postRequestParameter('yrfailed'),
+                       postRequestParameter('ytrans'),
+                       postRequestParameter('allow_url'),
                ), __FILE__, __LINE__);
 
                // Get message
@@ -83,19 +83,19 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
 $result_mem = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `status`='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);
 
 $display = true;
-if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
        // Edit payout types
-       if ((isGetRequestElementSet('ok')) && (getRequestElement('ok') == 'ok')) {
+       if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
                // Init SQLs
                initSqls();
 
                // Edit entries
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Secure id
                        $id = bigintval($id);
 
                        // Edit only if something is entered
-                       if ((isPostRequestElementSet('title', $id)) && (postRequestElement('rate', $id) > 0)) {
+                       if ((isPostRequestParameterSet('title', $id)) && (postRequestParameter('rate', $id) > 0)) {
                                // Update entry
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_payout_types` SET
 type='%s',
@@ -104,10 +104,10 @@ min_points=%s,
 allow_url='%s'
 WHERE `id`='".$id."' LIMIT 1",
                                array(
-                                       postRequestElement('title', $id),
-                                       convertCommaToDot(postRequestElement('rate', $id)),
-                                       convertCommaToDot(postRequestElement('min_points' , $id)),
-                                       postRequestElement('allow', $id),
+                                       postRequestParameter('title', $id),
+                                       convertCommaToDot(postRequestParameter('rate', $id)),
+                                       convertCommaToDot(postRequestParameter('min_points' , $id)),
+                                       postRequestParameter('allow', $id),
                                ),__FILE__, __LINE__, false));
                        }
                }
@@ -120,7 +120,7 @@ WHERE `id`='".$id."' LIMIT 1",
        } else {
                $display = false; //Suppress any other outputs
                $OUT = ''; $SW = 2;
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Load data
                        $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
@@ -145,14 +145,14 @@ WHERE `id`='".$id."' LIMIT 1",
                // Load main template
                loadTemplate('admin_config_payouts_edit', false, $OUT);
        }
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
        // Delete payout types
-       if ((isGetRequestElementSet('ok')) && (getRequestElement('ok') == 'ok')) {
+       if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
                // Init SQLs
                initSqls();
 
                // Delete entries
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__, false));
                } // END - foreach
@@ -165,7 +165,7 @@ WHERE `id`='".$id."' LIMIT 1",
        } else {
                $display = false; //Suppress any other outputs
                $OUT = ''; $SW = 2;
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        // Secure id number
                        $id = bigintval($id);
 
index c763bb1..8c36a07 100644 (file)
@@ -48,59 +48,59 @@ addMenuDescription('admin', __FILE__);
 $message = '';
 
 // Is the 'sub' parameter set?
-if (isGetRequestElementSet('sub')) {
+if (isGetRequestParameterSet('sub')) {
        // Yes, then do some sanity-checks
-       switch (getRequestElement('sub')) {
+       switch (getRequestParameter('sub')) {
                case 'points':
-                       if ((!isPostRequestElementSet(('points_register'))) || (!isPostRequestElementSet(('points_ref')))) {
-                               unsetPostRequestElement('ok');
+                       if ((!isPostRequestParameterSet(('points_register'))) || (!isPostRequestParameterSet(('points_ref')))) {
+                               unsetPostRequestParameter('ok');
                        }
                        break;
 
                case 'ref':
-                       if (isGetRequestElementSet('do')) {
-                               if (((!isPostRequestElementSet(('level'))) || (!isPostRequestElementSet(('percents')))) && (getRequestElement('do') == 'add')) {
-                                       unsetPostRequestElement('ok');
+                       if (isGetRequestParameterSet('do')) {
+                               if (((!isPostRequestParameterSet(('level'))) || (!isPostRequestParameterSet(('percents')))) && (getRequestParameter('do') == 'add')) {
+                                       unsetPostRequestParameter('ok');
                                }
                        }
                        break;
        }
 } else {
        // Display overview
-       setGetRequestElement('sub', 'overview');
+       setGetRequestParameter('sub', 'overview');
 }
 
 if (isFormSent()) {
        initSqls();
-       switch (getRequestElement('sub')) {
+       switch (getRequestParameter('sub')) {
                case 'points':
-                       updateConfiguration(array('points_register', 'points_ref'), array(postRequestElement('points_register'), postRequestElement('points_ref')));
+                       updateConfiguration(array('points_register', 'points_ref'), array(postRequestParameter('points_register'), postRequestParameter('points_ref')));
                        break;
 
                case 'ref':
-                       switch (getRequestElement('do'))
+                       switch (getRequestParameter('do'))
                        {
                                case 'add':
-                                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES ('".postRequestElement('level')."','".postRequestElement('percents')."')");
+                                       addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES ('".postRequestParameter('level')."','".postRequestParameter('percents')."')");
                                        break;
 
                                case 'edit': // Change entries
-                                       foreach (postRequestElement('level') as $id => $value) {
+                                       foreach (postRequestParameter('level') as $id => $value) {
                                                // Secure id
                                                $id = bigintval($id);
 
                                                // Revert german commata
-                                               setPostRequestElement('percents', array($id => convertCommaToDot(postRequestElement('percents', $id))));
+                                               setPostRequestParameter('percents', array($id => convertCommaToDot(postRequestParameter('percents', $id))));
 
                                                // Update entry
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($value), postRequestElement('percents', $id), $id), __FILE__, __LINE__);
+                                               array(bigintval($value), postRequestParameter('percents', $id), $id), __FILE__, __LINE__);
                                        }
                                        $message = getMessage('REF_DEPTHS_SAVED');
                                        break;
 
                                case 'del':
-                                       foreach (postRequestElement('id') as $id => $value) {
+                                       foreach (postRequestParameter('id') as $id => $value) {
                                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                                array(bigintval($id)), __FILE__, __LINE__);
                                        }
@@ -115,16 +115,16 @@ if (isFormSent()) {
                        break;
 
                case 'settings':
-                       $REF = bigintval(postRequestElement('ref_payout'));
+                       $REF = bigintval(postRequestParameter('ref_payout'));
                        updateConfiguration(
                                array('allow_direct_pay', 'reg_points_mode', 'ref_payout'),
-                               array(postRequestElement('allow_direct_pay'), postRequestElement('reg_points_mode'), $REF)
+                               array(postRequestParameter('allow_direct_pay'), postRequestParameter('reg_points_mode'), $REF)
                        );
-                       if ((getConfig('ref_payout') == '0') && (postRequestElement('ref_payout') > 0)) {
+                       if ((getConfig('ref_payout') == '0') && (postRequestParameter('ref_payout') > 0)) {
                                // Update account's ref_payout for "must-confirm"
                                addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=(%s - `mails_confirmed`)
 WHERE `mails_confirmed` < %s", $REF, $REF));
-                       } elseif ((getConfig('ref_payout') > 0) && (postRequestElement('ref_payout') == '0')) {
+                       } elseif ((getConfig('ref_payout') > 0) && (postRequestParameter('ref_payout') == '0')) {
                                // Update account's ref_payout for "not-must-confirm"
                                addSql("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_payout`=0 WHERE `ref_payout` > 0");
                                addSql("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `points`=`points`+`locked_points` WHERE `locked_points` > 0");
@@ -136,7 +136,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
        if ((isSqlsValid()) && (isSqlsValid())) {
                if (strpos($GLOBALS['sqls'][0], 'INSERT') > -1) {
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `level`='%s' LIMIT 1",
-                               array(bigintval(postRequestElement('level'))), __FILE__, __LINE__);
+                               array(bigintval(postRequestParameter('level'))), __FILE__, __LINE__);
                        SQL_FREERESULT($result);
                } // END - if
 
@@ -163,7 +163,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                // When do so...
                loadTemplate('admin_settings_saved', false, $message);
        }
-} elseif (getRequestElement('sub') == 'settings') {
+} elseif (getRequestParameter('sub') == 'settings') {
        // Setup some settings like direct pay and so on
        // Including new add-mode for one-time referal bonus
        foreach (array('allow_direct_pay') as $entry) {
@@ -180,12 +180,12 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
 
        // Load template
        loadTemplate('admin_config_point_settings', false, $content);
-} elseif (getRequestElement('sub') == 'ref') {
+} elseif (getRequestParameter('sub') == 'ref') {
        // 12                  3     32    2                  3     32    2               3            4     43    21
-       if ((isPostRequestElementSet('del')) && (isPostRequestElementSet('sel')) && (countPostSelection() > 0)) {
+       if ((isPostRequestParameterSet('del')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
                // Delete entries
                $OUT = ''; $SW = 2;
-               foreach (postRequestElement('sel') as $id => $value) {
+               foreach (postRequestParameter('sel') as $id => $value) {
                        $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
@@ -206,10 +206,10 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
 
                // Load main template
                loadTemplate('admin_points_del', false, $OUT);
-       } elseif ((isPostRequestElementSet('edit')) && (isPostRequestElementSet('sel')) && (countPostSelection() > 0)) {
+       } elseif ((isPostRequestParameterSet('edit')) && (isPostRequestParameterSet('sel')) && (countPostSelection() > 0)) {
                // Edit entries
                $OUT = ''; $SW = 2;
-               foreach (postRequestElement('sel') as $id => $value) {
+               foreach (postRequestParameter('sel') as $id => $value) {
                        $result = SQL_QUERY_ESC("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        $content = SQL_FETCHARRAY($result);
@@ -258,7 +258,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                // Form for adding new referal levels
                loadTemplate('admin_add_reflevel');
        }
-} elseif (getRequestElement('sub') == 'points') {
+} elseif (getRequestParameter('sub') == 'points') {
        // Load template
        loadTemplate('admin_config_sub_points');
 } else {
index 7517618..72ce426 100644 (file)
@@ -49,10 +49,10 @@ if (isFormSent()) {
        mergeConfig(postRequestArray());
 
        // Is the password set?
-       if (isPostRequestElementSet(('pass'))) {
+       if (isPostRequestParameterSet(('pass'))) {
                // Then hash and remove it
-               setPostRequestElement('primera_api_md5', md5(postRequestElement('pass')));
-               unsetPostRequestElement('pass');
+               setPostRequestParameter('primera_api_md5', md5(postRequestParameter('pass')));
+               unsetPostRequestParameter('pass');
        } // END - if
 
        // Let's test the API first (hold your horses here, cowboy! Thank you. :) )
index 9104ffb..86b94a6 100644 (file)
@@ -44,23 +44,23 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestElementSet('rallye')) {
+if (isGetRequestParameterSet('rallye')) {
        // Price submitted?
-       if (isPostRequestElementSet('add')) {
-               if ((isPostRequestElementSet(('level'))) && ((isPostRequestElementSet('points')) || (isPostRequestElementSet(('info'))))) {
+       if (isPostRequestParameterSet('add')) {
+               if ((isPostRequestParameterSet(('level'))) && ((isPostRequestParameterSet('points')) || (isPostRequestParameterSet(('info'))))) {
                        // Submitted data is valid, but maybe we already have this price level?
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s AND `price_level`='%s' LIMIT 1",
-                       array(bigintval(getRequestElement('rallye')), bigintval(postRequestElement('level'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('rallye')), bigintval(postRequestParameter('level'))), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == '0') {
                                // Ok, new price level entered!
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
                                array(
-                                       bigintval(getRequestElement('rallye')),
-                                       bigintval(postRequestElement('level')),
-                                       postRequestElement('points'),
-                                       postRequestElement('info')
+                                       bigintval(getRequestParameter('rallye')),
+                                       bigintval(postRequestParameter('level')),
+                                       postRequestParameter('points'),
+                                       postRequestParameter('info')
                                ), __FILE__, __LINE__);
                                loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
                        } else {
@@ -71,11 +71,11 @@ VALUES ('%s','%s','%s','%s')",
                                loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_ALREADY_FOUND'));
                        }
                }
-       } elseif (isPostRequestElementSet('remove')) {
+       } elseif (isPostRequestParameterSet('remove')) {
                // Check if at last one line is selected
                if (countPostSelection() > 0) {
                        // Delete selected entries
-                       foreach (postRequestElement('sel') as $id => $sel) {
+                       foreach (postRequestParameter('sel') as $id => $sel) {
                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
                        } // END - foreach
@@ -85,9 +85,9 @@ VALUES ('%s','%s','%s','%s')",
                } else {
                        loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_NOT_DELETED'));
                }
-       } elseif (isPostRequestElementSet('change')) {
+       } elseif (isPostRequestParameterSet('change')) {
                // Change entries
-               foreach (postRequestElement('level') as $id => $level) {
+               foreach (postRequestParameter('level') as $id => $level) {
                        // Secure id
                        $id = bigintval($id);
 
@@ -103,10 +103,10 @@ WHERE
        `id`=%s
 LIMIT 1",
                                array(
-                                       postRequestElement('rallye_id', $id),
+                                       postRequestParameter('rallye_id', $id),
                                        bigintval($level),
-                                       postRequestElement('points', $id),
-                                       postRequestElement('infos', $id),
+                                       postRequestParameter('points', $id),
+                                       postRequestParameter('infos', $id),
                                        $id
                                ), __FILE__, __LINE__);
                }
@@ -115,12 +115,12 @@ LIMIT 1",
                loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED'));
        }
 
-       if (isPostRequestElementSet('edit')) {
+       if (isPostRequestParameterSet('edit')) {
                // Check if at last one line is selected
                if (countPostSelection() > 0) {
                        // Make selected editable
                        $OUT = ''; $SW = 2;
-                       foreach (postRequestElement('sel') as $id => $sel) {
+                       foreach (postRequestParameter('sel') as $id => $sel) {
                                // Load data to selected rallye
                                $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
@@ -144,21 +144,21 @@ LIMIT 1",
                        $content['rows'] = $OUT;
 
                        // Prepare data for the main template
-                       $content['rallye'] = getRequestElement('rallye');
+                       $content['rallye'] = getRequestParameter('rallye');
 
                        // Load main template
                        loadTemplate('admin_config_rallye_edit', false, $content);
                } else {
                        // Nothing selected
-                       $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestElement('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
+                       $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestParameter('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
                        loadTemplate('admin_settings_saved', false, $content);
                }
-       } elseif (isPostRequestElementSet('del')) {
+       } elseif (isPostRequestParameterSet('del')) {
                // Check if at last one line is selected
                if (countPostSelection() > 0) {
                        // List all prices
                        $OUT = ''; $SW = 2;
-                       foreach (postRequestElement('sel') as $id => $sel) {
+                       foreach (postRequestParameter('sel') as $id => $sel) {
                                // Load data to selected rallye
                                $result = SQL_QUERY_ESC("SELECT `rallye_id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($id)), __FILE__, __LINE__);
@@ -183,19 +183,19 @@ LIMIT 1",
                        $content['rows'] = $OUT;
 
                        // Prepare data for the main template
-                       $content['rallye'] = getRequestElement('rallye');
+                       $content['rallye'] = getRequestParameter('rallye');
 
                        // Load main template
                        loadTemplate('admin_config_rallye_del', false, $content);
                } else {
                        // Nothing selected
-                       $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestElement('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
+                       $content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestParameter('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
                        loadTemplate('admin_settings_saved', false, $content);
                }
        } else {
                // a rallye was selected, so check if there are already prices assigned...
                $result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
-                       array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0) {
                        // Load all prices for the selected rallye
@@ -226,7 +226,7 @@ LIMIT 1",
                        $content['rows'] = $OUT;
 
                        // Prepare data for the main template
-                       $content['rallye'] = getRequestElement('rallye');
+                       $content['rallye'] = getRequestParameter('rallye');
 
                        // Load main template
                        loadTemplate('admin_config_rallye_prices', false, $content);
@@ -234,8 +234,8 @@ LIMIT 1",
        }
 
        // Add form for adding new price level
-       if (!isPostRequestElementSet('edit')) {
-               loadTemplate('admin_add_rallye_prices', false, getRequestElement('rallye'));
+       if (!isPostRequestParameterSet('edit')) {
+               loadTemplate('admin_add_rallye_prices', false, getRequestParameter('rallye'));
        } // END - if
 } else {
        // No rallye selected so display all available without prices
index c4bf6bc..2249983 100644 (file)
@@ -46,7 +46,7 @@ addMenuDescription('admin', __FILE__);
 
 // Do we want to save changes?
 if (isFormSent()) {
-       foreach (postRequestElement('sel') as $id => $value) {
+       foreach (postRequestParameter('sel') as $id => $value) {
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_must_register` SET field_required='%s' WHERE `id`=%s AND field_required != '%s' LIMIT 1",
                array($value, bigintval($id), $value),__FILE__, __LINE__);
        }
index 523bb77..8fe76d0 100644 (file)
@@ -41,8 +41,8 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Calculate timestamp from selections...
-       setPostRequestElement('ip_timeout', createTimestampFromSelections('ip_timeout', postRequestArray()));
-       setPostRequestElement('least_cats', round(postRequestElement('least_cats')));
+       setPostRequestParameter('ip_timeout', createTimestampFromSelections('ip_timeout', postRequestArray()));
+       setPostRequestParameter('least_cats', round(postRequestParameter('least_cats')));
 
        // Save settings
        adminSaveSettingsFromPostData();
index d2cf11c..2ca1373 100644 (file)
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 if (isFormSent()) {
        // Generate string
        $MODs = array();
-       foreach (postRequestElement('mod') as $mod => $sel) {
+       foreach (postRequestParameter('mod') as $mod => $sel) {
                // Now you can never deselect the admin module, bah!!! ;-)
                if (($sel == 'Y') || ($mod == 'admin')) {
                        // Add module to queue
@@ -56,8 +56,8 @@ if (isFormSent()) {
        }
 
        // Implode array to string and remove posted mod array
-       setPostRequestElement('rewrite_skip', implode(':', $MODs));
-       unsetPostRequestElement('mod');
+       setPostRequestParameter('rewrite_skip', implode(':', $MODs));
+       unsetPostRequestParameter('mod');
 
        // Save settings
        adminSaveSettingsFromPostData();
index 633226b..37abe1b 100644 (file)
@@ -46,12 +46,12 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // If salt length is empty or null then we shall generate new passwords
-       if (!isPostRequestElementSet(('salt_length')) || (postRequestElement('salt_length') == '0')) {
+       if (!isPostRequestParameterSet(('salt_length')) || (postRequestParameter('salt_length') == '0')) {
                // Generate new passwords for all!
                loadInclude('inc/gen_sql_patches.php');
 
                // Forget the wrong number!
-               unsetPostRequestElement(('salt_length'));
+               unsetPostRequestParameter(('salt_length'));
 
                // Redirect to logout link
                redirectToUrl('modules.php?module=admin&amp;logout=1');
index cb36f02..8738d29 100644 (file)
@@ -46,7 +46,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Test Path
-       if ((!isPostRequestElementSet(('session_save_path'))) || ((isDirectory(postRequestElement('session_save_path'))) && (is_writeable(postRequestElement('session_save_path'))))) {
+       if ((!isPostRequestParameterSet(('session_save_path'))) || ((isDirectory(postRequestParameter('session_save_path'))) && (is_writeable(postRequestParameter('session_save_path'))))) {
                // Save configuration
                adminSaveSettingsFromPostData();
        } else {
index ba30ff1..e392bf4 100644 (file)
@@ -46,8 +46,8 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Allow only direct points (non-floating)
-       setPostRequestElement('sponsor_min_points', bigintval(postRequestElement('sponsor_min_points')));
-       setPostRequestElement('sponsor_ref_points', bigintval(postRequestElement('sponsor_ref_points')));
+       setPostRequestParameter('sponsor_min_points', bigintval(postRequestParameter('sponsor_min_points')));
+       setPostRequestParameter('sponsor_ref_points', bigintval(postRequestParameter('sponsor_ref_points')));
 
        // Save settings
        adminSaveSettingsFromPostData();
index 3b34e9b..81ac159 100644 (file)
@@ -47,9 +47,9 @@ addMenuDescription('admin', __FILE__);
 // Was the form submitted?
 if (isFormSent()) {
        // Replace german decimal comma with computer decimal dot
-       if (isPostRequestElementSet(('surfbar_static_reward')))   setPostRequestElement('surfbar_static_reward'  , convertCommaToDot(postRequestElement('surfbar_static_reward')));
-       if (isPostRequestElementSet(('surfbar_static_costs')))    setPostRequestElement('surfbar_static_costs'   , convertCommaToDot(postRequestElement('surfbar_static_costs')));
-       if (isPostRequestElementSet(('surfbar_dynamic_percent'))) setPostRequestElement('surfbar_dynamic_percent', convertCommaToDot(postRequestElement('surfbar_dynamic_percent')));
+       if (isPostRequestParameterSet(('surfbar_static_reward')))   setPostRequestParameter('surfbar_static_reward'  , convertCommaToDot(postRequestParameter('surfbar_static_reward')));
+       if (isPostRequestParameterSet(('surfbar_static_costs')))    setPostRequestParameter('surfbar_static_costs'   , convertCommaToDot(postRequestParameter('surfbar_static_costs')));
+       if (isPostRequestParameterSet(('surfbar_dynamic_percent'))) setPostRequestParameter('surfbar_dynamic_percent', convertCommaToDot(postRequestParameter('surfbar_dynamic_percent')));
 
        // Save settings
        adminSaveSettingsFromPostData();
index 8ba62a9..9058c56 100644 (file)
@@ -52,12 +52,12 @@ if (isFormSent()) {
        if (WERNIS_TEST_API()) {
                // Revert german commata
                foreach (array('payout_factor', 'withdraw_factor', 'payout_fee_percent', 'withdraw_fee_percent') as $revert) {
-                       setPostRequestElement('wernis_' . $revert, postRequestElement('wernis_' . $revert));
+                       setPostRequestParameter('wernis_' . $revert, postRequestParameter('wernis_' . $revert));
                } // END - if
 
                // Hash the password and remove clear-text
-               setPostRequestElement('wernis_pass_md5', md5(postRequestElement('wernis_pass')));
-               unsetPostRequestElement('wernis_pass');
+               setPostRequestParameter('wernis_pass_md5', md5(postRequestParameter('wernis_pass')));
+               unsetPostRequestParameter('wernis_pass');
 
                // Save settings
                adminSaveSettingsFromPostData();
index b02f602..ea38583 100644 (file)
@@ -45,10 +45,10 @@ addMenuDescription('admin', __FILE__);
 // Init counter for deleted mails
 $cnt = '0';
 
-if (isGetRequestElementSet('mid')) {
+if (isGetRequestParameterSet('mid')) {
        // Load email data
        $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-               array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -86,7 +86,7 @@ ON
 WHERE
        s.`pool_id`=%s
 LIMIT 1",
-                       array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_pool) == 1) {
                        // Fetch stats id
                        list($stats_id) = SQL_FETCHROW($result_pool);
@@ -95,7 +95,7 @@ LIMIT 1",
                        $links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', true);
 
                        // Reset sent mails for recipient(s)
-                       reduceRecipientReceivedMails('stats_id', getRequestElement('mid'), $links);
+                       reduceRecipientReceivedMails('stats_id', getRequestParameter('mid'), $links);
 
                        // Calc total points and pay them back
                        $totalPoints = $links * $price;
@@ -141,7 +141,7 @@ LIMIT 1",
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link
-                       loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestElement('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
+                       loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestParameter('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
                } // END - if
 
                // Free the result
@@ -149,7 +149,7 @@ LIMIT 1",
 
                // Delete mail from queue
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-                       array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
@@ -158,17 +158,17 @@ LIMIT 1",
                // Mail already deleted!
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
-} elseif (isGetRequestElementSet('pid')) {
+} elseif (isGetRequestParameterSet('pid')) {
        // Remove stats entries
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
-               array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
 
        // Output message
        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
-} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
+} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
        // Load data from bonus mail
        $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
-               array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -176,17 +176,17 @@ LIMIT 1",
                $content = SQL_FETCHARRAY($result);
 
                // Reset sent mails for recipient(s)
-               reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $content['mails_sent']);
+               reduceRecipientReceivedMails('bonus_id', getRequestParameter('bid'), $content['mails_sent']);
 
                // Init counter for deleted mails
                $cnt = '0';
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-                       array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-                       array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
@@ -203,10 +203,10 @@ LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result);
-} elseif ((isGetRequestElementSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} elseif ((isGetRequestParameterSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
        // Load data from bonus mail
        $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
-               array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -218,10 +218,10 @@ LIMIT 1",
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-                       array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-                       array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
index 9669af5..86fbe69 100644 (file)
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 if (countPostSelection() > 0) {
        // Delete multiple holiday requests (for list_holiday)
        $cnt = '0';
-       foreach (postRequestElement('sel') as $id => $sel) {
+       foreach (postRequestParameter('sel') as $id => $sel) {
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT
        `userid`, `holiday_start`, `holiday_end`
@@ -91,7 +91,7 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                }
        }
        loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_ADMIN_MULTI_DEL', $cnt));
-} elseif (isGetRequestElementSet('userid')) {
+} elseif (isGetRequestParameterSet('userid')) {
        // Set default message
        $message = getMessage('HOLIDAY_ADMIN_SINGLE_404');
 
@@ -103,7 +103,7 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1",
-               array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_load) == 1) {
                // Load data
                $content = SQL_FETCHARRAY($result_load);
@@ -113,11 +113,11 @@ LIMIT 1",
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
        `userid`=%s
-LIMIT 1", array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
                // Send email to user
-               $message = loadEmailTemplate('member_holiday_removed', $content, getRequestElement('userid'));
-               sendEmail(getRequestElement('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+               $message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
+               sendEmail(getRequestParameter('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
 
                // Set message
                $message = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');
index 504c395..58adfca 100644 (file)
@@ -44,10 +44,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestElementSet('id')) {
+if (isGetRequestParameterSet('id')) {
        // Check for selected sponsor
        $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1",
-               array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
                if (isFormSent()) {
@@ -56,39 +56,39 @@ if (isGetRequestElementSet('id')) {
 
                        // Prepare data for the template
                        $content['gender']  = translateGender($content['gender']);
-                       $content['reason']  = secureString(postRequestElement('reason'));
+                       $content['reason']  = secureString(postRequestParameter('reason'));
 
                        // Prepare message and send it away
-                       $message = loadEmailTemplate('del_sponsor', $content, bigintval(getRequestElement('id')));
+                       $message = loadEmailTemplate('del_sponsor', $content, bigintval(getRequestParameter('id')));
                        sendEmail($content['email'], getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $message);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1",
-                               array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+                               array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Remove orders
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_orders` WHERE `sponsorid`='%s' LIMIT 1",
-                               array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+                               array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_DELETED', bigintval(getRequestElement('id'))));
-               } elseif (isPostRequestElementSet('no')) {
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_DELETED', bigintval(getRequestParameter('id'))));
+               } elseif (isPostRequestParameterSet('no')) {
                        // Do not delete him...
-                       redirectToUrl('modules.php?module=admin&amp;what=list_sponsor&amp;id='.bigintval(getRequestElement('id')));
+                       redirectToUrl('modules.php?module=admin&amp;what=list_sponsor&amp;id='.bigintval(getRequestParameter('id')));
                } else {
                        // Load data
                        $content = SQL_FETCHARRAY($result);
 
                        // Transfer data to constants for the template
                        $content['gender'] = translateGender($content['gender']);
-                       $content['userid'] = bigintval(getRequestElement('id'));
+                       $content['userid'] = bigintval(getRequestParameter('id'));
 
                        // Display form
                        loadTemplate('admin_del_sponsor', false, $content);
                }
        } else {
                // Sponsor not found!
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestElement('id'))));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
        }
 
        // Free result
index e752aae..a8c2d3f 100644 (file)
@@ -44,14 +44,14 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('del')) {
+if (isPostRequestParameterSet('del')) {
        // Delete entries from tables
        if (countPostSelection() > 0) {
                // Init SQLs
                initSqls();
 
                // Delete entries...
-               foreach (postRequestElement('sel') as $id => $sel) {
+               foreach (postRequestParameter('sel') as $id => $sel) {
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `trans_id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__, false));
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `trans_id`=%s LIMIT 1",
index c455bba..26459be 100644 (file)
@@ -45,42 +45,42 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // User exists..
-if ((isFormSent()) || ((isPostRequestElementSet('del')) && (isPostRequestElementSet(('reason'))))) {
+if ((isFormSent()) || ((isPostRequestParameterSet('del')) && (isPostRequestParameterSet(('reason'))))) {
        // Is the account there?
-       if (fetchUserData(getRequestElement('userid'))) {
+       if (fetchUserData(getRequestParameter('userid'))) {
                // Delete user account
-               deleteUserAccount(getRequestElement('userid'), postRequestElement('reason'));
+               deleteUserAccount(getRequestParameter('userid'), postRequestParameter('reason'));
 
                // Output message
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
        }
-} elseif (isPostRequestElementSet('no')) {
+} elseif (isPostRequestParameterSet('no')) {
        // Do not delete him...
-       redirectToUrl(adminCreateUserLink(getRequestElement('userid')));
-} elseif (!isGetRequestElementSet('userid')) {
+       redirectToUrl(adminCreateUserLink(getRequestParameter('userid')));
+} elseif (!isGetRequestParameterSet('userid')) {
        // Output selection form with all confirmed user accounts listed
        addMemberSelectionBox();
 } else {
        // Realy want to delete?
-       if (fetchUserData(getRequestElement('userid'))) {
+       if (fetchUserData(getRequestParameter('userid'))) {
                // Prepare content
                $content = array(
                        'email'   => generateEmailLink(getUserData('email'), 'user_data'),
                        'surname' => getUserData('surname'),
                        'family'  => getUserData('family'),
-                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', getRequestElement('userid')),
-                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', getRequestElement('userid')),
-                       'userid'  => getRequestElement('userid')
+                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', getRequestParameter('userid')),
+                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', getRequestParameter('userid')),
+                       'userid'  => getRequestParameter('userid')
                );
 
                // Display form
                loadTemplate('admin_del_user', false, $content);
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
        }
 }
 
index e415952..187d3c8 100644 (file)
@@ -44,8 +44,8 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if ((isFormSent()) && (!isPostRequestElementSet('id'))) {
-       unsetPostRequestElement('ok');
+if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
+       unsetPostRequestParameter('ok');
 }
 
 $result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{?_MYSQL_PREFIX?}_pool` ORDER BY timestamp", __FILE__, __LINE__);
@@ -53,19 +53,19 @@ if (SQL_NUMROWS($result) > 0) {
        if (isFormSent()) {
                // Make mail editable...
                $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-               array(bigintval(postRequestElement('id'))), __FILE__, __LINE__);
+               array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
                list($subj, $text, $url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // Prepare constant for template
-               $content['id']       = bigintval(postRequestElement('id'));
+               $content['id']       = bigintval(postRequestParameter('id'));
                $content['url']      = $url;
                $content['subject']  = $subj;
                $content['text']     = $text;
 
                // Load template
                loadTemplate('admin_edit_email', false, $content);
-       } elseif (isPostRequestElementSet('save')) {
+       } elseif (isPostRequestParameterSet('save')) {
                // Save changes
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_pool`
@@ -77,10 +77,10 @@ WHERE
        `id`=%s
 LIMIT 1",
                        array(
-                               postRequestElement('subject'),
-                               postRequestElement('text'),
-                               postRequestElement('url'),
-                               bigintval(postRequestElement('id')),
+                               postRequestParameter('subject'),
+                               postRequestParameter('text'),
+                               postRequestParameter('url'),
+                               bigintval(postRequestParameter('id')),
                        ), __FILE__, __LINE__);
 
                if (SQL_AFFECTEDROWS() == 1) {
index d3895cd..74ee72c 100644 (file)
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('mode'))) {
+if ((isGetRequestParameterSet('id')) && (isGetRequestParameterSet('mode'))) {
        // Check for selected sponsor
        $result_main = SQL_QUERY_ESC("SELECT
        `company`, `position`, `gender`, `surname`, `family`,
@@ -56,14 +56,14 @@ FROM
 WHERE
        `id`='%s'
 LIMIT 1",
-               array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+               array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) == 1) {
                // Load sponsor details
                $content = SQL_FETCHARRAY($result_main);
 
                // Prepare all data for the template
                //  Sponsor's id
-               $content['id'] = bigintval(getRequestElement('id'));
+               $content['id'] = bigintval(getRequestParameter('id'));
 
                // Init gender
                foreach (array('m', 'f', 'c') as $gender) {
@@ -78,25 +78,25 @@ LIMIT 1",
                $content['interval']         = createTimeSelections($content['warning_interval'], 'warning_interval', 'MWDh');
 
                // Init variables here
-               $TPL = sprintf("admin_edit_sponsor_%s", getRequestElement('mode'));
+               $TPL = sprintf("admin_edit_sponsor_%s", getRequestParameter('mode'));
                initSqls();
 
                // Sponsor was found
-               if ((isFormSent()) || (isPostRequestElementSet('edit'))) {
+               if ((isFormSent()) || (isPostRequestParameterSet('edit'))) {
                        // Perform action on mode
-                       switch (getRequestElement('mode')) {
+                       switch (getRequestParameter('mode')) {
                                case 'add_points': // Add points
-                                       if (bigintval(postRequestElement('points')) > 0) {
+                                       if (bigintval(postRequestParameter('points')) > 0) {
                                                // Replace german decimal comma with computer's decimal dot
-                                               $points = bigintval(convertCommaToDot(postRequestElement('points')));
+                                               $points = bigintval(convertCommaToDot(postRequestParameter('points')));
 
                                                // Add points to account
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `points_amount`=`points_amount`+%s WHERE `id`='%s' LIMIT 1",
-                                                       array($points, bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+                                                       array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                $content['points'] = translateComma($points);
-                                               $content['reason'] = secureString(postRequestElement('reason'));
+                                               $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_add_points', $content);
@@ -109,17 +109,17 @@ LIMIT 1",
                                        break;
 
                                case 'sub_points': // Subtract points
-                                       if (bigintval(postRequestElement('points')) > 0) {
+                                       if (bigintval(postRequestParameter('points')) > 0) {
                                                // Replace german decimal comma with computer's decimal dot
-                                               $points = bigintval(convertCommaToDot(postRequestElement('points')));
+                                               $points = bigintval(convertCommaToDot(postRequestParameter('points')));
 
                                                // Add points to account
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET `points_used`=`points_used`+%s WHERE `id`='%s' LIMIT 1",
-                                                       array($points, bigintval(getRequestElement('id'))), __FILE__, __LINE__);
+                                                       array($points, bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                                                // Remember points /reason for the template
                                                $content['points'] = translateComma($points);
-                                               $content['reason'] = secureString(postRequestElement('reason'));
+                                               $content['reason'] = secureString(postRequestParameter('reason'));
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_sub_points', $content);
@@ -133,10 +133,10 @@ LIMIT 1",
 
                                case 'edit': // Edit sponsor account
                                        $PASS = true;
-                                       if ((postRequestElement('pass1') != postRequestElement('pass2')) || ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass1')))) {
+                                       if ((postRequestParameter('pass1') != postRequestParameter('pass2')) || ((!isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass1')))) {
                                                // Remove passwords
-                                               unsetPostRequestElement('pass1');
-                                               unsetPostRequestElement('pass2');
+                                               unsetPostRequestParameter('pass1');
+                                               unsetPostRequestParameter('pass2');
                                                $PASS = false;
                                        } // END - if
 
@@ -148,19 +148,19 @@ LIMIT 1",
                                        handlSponsorRequest(postRequestArray());
 
                                        // Convert some data for the email template
-                                       postRequestElement('gender'          , translateGender(postRequestElement('gender')));
-                                       postRequestElement('warning_interval', createFancyTime(postRequestElement('warning_interval')));
+                                       postRequestParameter('gender'          , translateGender(postRequestParameter('gender')));
+                                       postRequestParameter('warning_interval', createFancyTime(postRequestParameter('warning_interval')));
 
-                                       if ($PASS === false) setPostRequestElement('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
+                                       if ($PASS === false) setPostRequestParameter('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
 
                                        // Load email template and send the mail away
                                        $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), false);
-                                       sendEmail(postRequestElement('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $message);
+                                       sendEmail(postRequestParameter('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $message);
                                        break;
 
                                default: // Unknown mode
-                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", getRequestElement('mode')));
-                                       $message = getMaskedMessage('ADMIN_SPONSOR_INVALID_MODE', getRequestElement('mode'));
+                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mode %s detected.", getRequestParameter('mode')));
+                                       $message = getMaskedMessage('ADMIN_SPONSOR_INVALID_MODE', getRequestParameter('mode'));
                                        break;
                        }
 
@@ -176,11 +176,11 @@ LIMIT 1",
                        loadTemplate($TPL);
                } else {
                        // Template not found!
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('mode')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_MODUS_TPL_404', getRequestParameter('mode')));
                }
        } else {
                // Sponsor not found!
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestElement('id'))));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
        }
 
        // Free result
index fa9f1b1..6922dbe 100644 (file)
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 
 // Fix a notice
 $result_main = false;
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
        // Load user entry
        $result_main = SQL_QUERY_ESC("SELECT
        `userid`, `gender`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`,
@@ -61,25 +61,25 @@ WHERE
        `userid`=%s
 LIMIT 1",
                array(
-                       bigintval(getRequestElement('userid'))
+                       bigintval(getRequestParameter('userid'))
                ), __FILE__, __LINE__);
 } // END - if
 
-if ((SQL_NUMROWS($result_main) == 1) || (!isGetRequestElementSet('userid'))) {
+if ((SQL_NUMROWS($result_main) == 1) || (!isGetRequestParameterSet('userid'))) {
        // User found
-       if (!isGetRequestElementSet('userid')) {
+       if (!isGetRequestParameterSet('userid')) {
                // Output selection form with all confirmed user accounts listed
                addMemberSelectionBox();
-       } elseif (isPostRequestElementSet('edit')) {
+       } elseif (isPostRequestParameterSet('edit')) {
                // Ok, change the account...
                $updateUser = false; $add = '';
-               if ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
+               if ((!isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
                        // Don't change the password
                        $updateUser = true;
-               } elseif ((postRequestElement('pass1') == postRequestElement('pass2'))) {
+               } elseif ((postRequestParameter('pass1') == postRequestParameter('pass2'))) {
                        // Change the password
                        $updateUser = true;
-                       $add = ", `password`='" . generateHash(postRequestElement('pass1')) . "'";
+                       $add = ", `password`='" . generateHash(postRequestParameter('pass1')) . "'";
                }
 
                if ($updateUser === true) {
@@ -100,15 +100,15 @@ WHERE
        `userid`=%s
 LIMIT 1",
                        array(
-                               substr(postRequestElement('gender'), 0, 1),
-                               postRequestElement('surname'),
-                               postRequestElement('family'),
-                               postRequestElement('street_nr'),
-                               postRequestElement('country'),
-                               bigintval(postRequestElement('zip')),
-                               postRequestElement('city'),
-                               postRequestElement('email'),
-                               bigintval(getRequestElement('userid')),
+                               substr(postRequestParameter('gender'), 0, 1),
+                               postRequestParameter('surname'),
+                               postRequestParameter('family'),
+                               postRequestParameter('street_nr'),
+                               postRequestParameter('country'),
+                               bigintval(postRequestParameter('zip')),
+                               postRequestParameter('city'),
+                               postRequestParameter('email'),
+                               bigintval(getRequestParameter('userid')),
                        ), __FILE__, __LINE__);
                        $content = getMessage('USER_ACCOUNT_SAVED');
                } else {
@@ -135,7 +135,7 @@ LIMIT 1",
        }
 } else {
        // Account does not exists!
-       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
 }
 
 // Free the result
index 045ec1f..d5ebddd 100644 (file)
@@ -61,11 +61,11 @@ ORDER BY
 $result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
-if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('mails_page'));
+if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
+if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
+$sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
index 33d0af9..8de0c03 100644 (file)
@@ -64,22 +64,22 @@ ORDER BY timestamp DESC";
 $WHO = getMessage('_ALL');
 $SQL2 = '';
 
-if (isGetRequestElementSet(('mid'))) {
+if (isGetRequestParameterSet(('mid'))) {
        // Only a specific mail shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
         FROM `{?_MYSQL_PREFIX?}_pool`
-        WHERE `id`='".bigintval(getRequestElement('mid'))."'
+        WHERE `id`='".bigintval(getRequestParameter('mid'))."'
         LIMIT 1";
-       $WHO = getMessage('MAIL_ID').": ".getRequestElement('mid');
-} elseif (isGetRequestElementSet('userid')) {
+       $WHO = getMessage('MAIL_ID').": ".getRequestParameter('mid');
+} elseif (isGetRequestParameterSet('userid')) {
        // All mails by a specific member shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
 FROM `{?_MYSQL_PREFIX?}_pool`
-WHERE sender='".bigintval(getRequestElement('userid'))."'
+WHERE sender='".bigintval(getRequestParameter('userid'))."'
 ORDER by timestamp DESC";
-       $WHO = getMessage('USER_ID').": ".getRequestElement('userid');
+       $WHO = getMessage('USER_ID').": ".getRequestParameter('userid');
 }
 
 if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
@@ -98,22 +98,22 @@ ORDER BY timestamp DESC";
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page')) setGetRequestElement('page', 1);
+if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
 
-if (!isGetRequestElementSet('offset')) {
+if (!isGetRequestParameterSet('offset')) {
        if (isConfigEntrySet('mails_page')) {
                // Set config entry
-               setGetRequestElement('offset', getConfig('mails_page'));
+               setGetRequestParameter('offset', getConfig('mails_page'));
        } else {
                // Set default one
-               setGetRequestElement('offset', 10);
+               setGetRequestParameter('offset', 10);
        }
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestElementSet(('mid'))) {
+if (!isGetRequestParameterSet(('mid'))) {
        // Create limitation line
-       $add = " LIMIT ".(bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))).", ".bigintval(getRequestElement('offset'));
+       $add = " LIMIT ".(bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))).", ".bigintval(getRequestParameter('offset'));
 
        // For normal mail