fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / guest / what-confirm.php

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index dc271286bfa0667c53db25de1a80843f05493050..73d25eef456dc97436fa83a5fba7167b09036f83 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -50,13 +50,13 @@ $content = array(
        'userid'  => 0,
 );
 
-if (isGetRequestElementSet('hash')) {
+if (isGetRequestParameterSet('hash')) {
        // Initialize the user id
        $userid = '0';
 
        // Search for an unconfirmed or confirmed account
        $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid`,`gender` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
-               array(getRequestElement('hash')), __FILE__, __LINE__);
+               array(getRequestParameter('hash')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
                list($userid, $email, $rid, $gender) = SQL_FETCHROW($result);
@@ -74,7 +74,7 @@ if (isGetRequestElementSet('hash')) {
 
                // Unlock his account (but only when it is on UNCONFIRMED!)
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='CONFIRMED', ref_payout={?ref_payout?}, `user_hash`=NULL WHERE `user_hash`='%s' AND `status`='UNCONFIRMED' LIMIT 1",
-                       array(getRequestElement('hash')), __FILE__, __LINE__);
+                       array(getRequestParameter('hash')), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
                        // Send email if updated
                        $message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
@@ -148,9 +148,9 @@ if (isGetRequestElementSet('hash')) {
 
        // Load template
        loadTemplate('admin_settings_saved', false, $content['message']);
-} elseif ((isFormSent()) && (isPostRequestElementSet('email'))) {
+} elseif ((isFormSent()) && (isPostRequestParameterSet('email'))) {
        // Confirmation link requested      0         1          2
-       if (fetchUserData(postRequestElement('email'), 'email')) {
+       if (fetchUserData(postRequestParameter('email'), 'email')) {
                // Email address found
                $content = getUserDataArray();
 
@@ -161,7 +161,7 @@ if (isGetRequestElementSet('hash')) {
                                $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
                                // Send email
-                               sendEmail(postRequestElement('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+                               sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
 
                                // And set message
                                $content['message'] = getMessage('CONFIRM_LINK_SENT');