fooRequestElementBar() functions renamed, adding of request parameters added:
[mailer.git] / inc / modules / member / what-transfer.php
index d4c987d89f539d7cdcbd89c7fcf9e96fa2589d6d..a41be9a31e4a584a1ac0095a1a7e7a51939a6a6a 100644 (file)
@@ -53,7 +53,7 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 
 // Check for mode in GET
 $mode = '';
-if (isGetRequestElementSet('mode')) $mode = getRequestElement('mode');
+if (isGetRequestParameterSet('mode')) $mode = getRequestParameter('mode');
 
 // Check for "faker"
 if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
@@ -70,24 +70,24 @@ switch ($mode) {
                        // Add new transfer
                        if (getConfig('transfer_code') > 0) {
                                // Check for code
-                               $code = generateRandomCode(getConfig('transfer_code'), postRequestElement('code_chk'), getMemberId(), $content['max_transferable']);
-                               $valid_code = ($code == postRequestElement('code'));
+                               $code = generateRandomCode(getConfig('transfer_code'), postRequestParameter('code_chk'), getMemberId(), $content['max_transferable']);
+                               $valid_code = ($code == postRequestParameter('code'));
                        } else {
                                // Zero length (= disabled) is always valid!
                                $valid_code = true;
                        }
 
                        // Test password
-                       $valid_pass = ($pass == generateHash(postRequestElement('password'), $pass));
+                       $valid_pass = ($pass == generateHash(postRequestParameter('password'), $pass));
 
                        // Test transfer amount
-                       $valid_amount = ((isPostRequestElementSet('points')) && (postRequestElement('points') <= $content['max_transferable']));
+                       $valid_amount = ((isPostRequestParameterSet('points')) && (postRequestParameter('points') <= $content['max_transferable']));
 
                        // Test reason for transfer
-                       $valid_reason = (isPostRequestElementSet('reason'));
+                       $valid_reason = (isPostRequestParameterSet('reason'));
 
                        // Test if a recipient is selected
-                       $valid_recipient = (postRequestElement('to_userid') > 0);
+                       $valid_recipient = (postRequestParameter('to_userid') > 0);
 
                        // Check for nickname extension and set additional data
                        // @TODO Rewrite this to a filter
@@ -100,7 +100,7 @@ switch ($mode) {
                        $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
                                array(
                                        getMemberId(),
-                                       bigintval(postRequestElement('to_userid'))
+                                       bigintval(postRequestParameter('to_userid'))
                                ), __FILE__, __LINE__);
 
                        // Do we have two entries?
@@ -129,7 +129,7 @@ switch ($mode) {
 
                                // Default is userids for subject line
                                $SENDER = getMemberId();
-                               $RECIPIENT = bigintval(postRequestElement('to_userid'));
+                               $RECIPIENT = bigintval(postRequestParameter('to_userid'));
 
                                // If nickname is installed we can set the nickname
                                // @TODO Rewrite this to a filter
@@ -138,32 +138,32 @@ switch ($mode) {
                                                $SENDER = $content['sender']['nickname'];
                                        }
 
-                                       if (($TEST_NICK_REC != postRequestElement('to_userid')) && (!empty($TEST_NICK_REC))) {
+                                       if (($TEST_NICK_REC != postRequestParameter('to_userid')) && (!empty($TEST_NICK_REC))) {
                                                $RECIPIENT = $content['recipient']['nickname'];
                                        }
                                } // END - if
 
                                // Remember transfer reason and fancy date/time in constants
-                               $content['reason']  = secureString(postRequestElement('reason'));
+                               $content['reason']  = secureString(postRequestParameter('reason'));
                                $content['expires'] = createFancyTime(getConfig('transfer_age'));
 
                                // Generate tranafer id
-                               $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestElement('reason')));
+                               $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestParameter('reason')));
 
                                // Add entries to both tables
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
-                                       array(bigintval(postRequestElement('to_userid')), getMemberId(), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(bigintval(postRequestParameter('to_userid')), getMemberId(), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
-                                       array(getMemberId(), bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(getMemberId(), bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')), postRequestParameter('reason'), $content['trans_id']), __FILE__, __LINE__);
 
                                // Add points to account *directly* ...
-                               addPointsDirectly('member_transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
+                               addPointsDirectly('member_transfer', bigintval(postRequestParameter('to_userid')), bigintval(postRequestParameter('points')));
 
                                // ... and add it to current user's used points
-                               subtractPoints('transfer', getMemberId(), postRequestElement('points'));
+                               subtractPoints('transfer', getMemberId(), postRequestParameter('points'));
 
                                // First send email to recipient
-                               $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid'));
+                               $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
                                sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
 
                                // Second send email to sender
@@ -179,27 +179,27 @@ switch ($mode) {
                        } elseif ($valid_code === false) {
                                // Invalid Touring code!
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_CODE--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        } elseif ($valid_pass === false) {
                                // Wrong password entered
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_PASSWORD--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        } elseif ($valid_amount === false) {
                                // Too much points entered
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_POINTS--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        } elseif ($valid_reason === false) {
                                // No transfer reason entered
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_REASON--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        } elseif ($valid_recipient === false) {
                                // No recipient selected
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_RECIPIENT--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        } elseif ($valid_data === false) {
                                // No recipient/sender selected
                                loadTemplate('admin_settings_saved', false, '<div class="member_note">{--TRANSFER_INVALID_DATA--}</div>');
-                               unsetPostRequestElement('ok');
+                               unsetPostRequestParameter('ok');
                        }
 
                        // Free result
@@ -225,7 +225,7 @@ switch ($mode) {
                                // @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
                                while (list($userid, $nick) = SQL_FETCHROW($result)) {
                                        $OUT .= "       <option value=\"".$userid."\"";
-                                       if ((isPostRequestElementSet(('to_userid'))) && (postRequestElement('to_userid') == $userid)) $OUT .= ' selected="selected"';
+                                       if ((isPostRequestParameterSet(('to_userid'))) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
                                        $OUT .= ">";
                                        if (($nick != $userid) && (!empty($nick))) {
                                                // Output nickname
@@ -266,10 +266,10 @@ switch ($mode) {
                        $content['reason'] = '';
 
                        // Transfer maybe already entered valued'
-                       if (isGetRequestElementSet('ok')) {
+                       if (isGetRequestParameterSet('ok')) {
                                // Get values from form
-                               $content['points'] = bigintval(postRequestElement('points'));
-                               $content['reason'] = secureString(postRequestElement('reason'));
+                               $content['points'] = bigintval(postRequestParameter('points'));
+                               $content['reason'] = secureString(postRequestParameter('reason'));
                        } // END - if
 
                        // Translate some array elements for template
@@ -478,10 +478,10 @@ KEY (`party_userid`)
                if (isFormSent()) {
                        // Save settings
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",
-                               array(postRequestElement('opt_in'), getMemberId()), __FILE__, __LINE__);
+                               array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
 
                        // Rember for next switch() command
-                       getUserData('opt_in') = substr(postRequestElement('opt_in'), 0, 1);
+                       getUserData('opt_in') = substr(postRequestParameter('opt_in'), 0, 1);
 
                        // "Settings saved..."
                        loadTemplate('admin_settings_saved', false, '<div class="member_done">{--SETTINGS_SAVED--}</div>');