Extension ext-earning introduced (unfinished), renamings:

[mailer.git] / inc / modules / member / what-mydata.php

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index fc0d0f8d504a878e7e8eb893b2b4e2aca1101270..2e15c02dad1bd3eab5c433a1808ebc575feedc46 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -58,9 +58,9 @@ $url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (isPostRequestParameterSet('save'))   $mode = 'save';   // Save entered data
+if (isPostRequestElementSet('save'))   $mode = 'save';   // Save entered data
 if (isFormSent('edit'))   $mode = 'edit';   // Edit data
-if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification
+if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification
 
 switch ($mode) {
        case 'show': // Show his data
@@ -162,10 +162,12 @@ LIMIT 1",
                        $content['max_receive_list'] = addMaxReceiveList('member', $content['max_mails'], true);
 
                        if (isExtensionActive('country')) {
-                               // Generate selection box
-                               $OUT  = '<select name="country_code" class="form_select" size="1">';
+                               // Init WHERE statement
                                $whereStatement = "WHERE `is_active`='Y'";
                                if (isAdmin()) $whereStatement = '';
+
+                               // Generate selection box
+                               $OUT  = '<select name="country_code" class="form_select" size="1">';
                                $OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement);
                                $OUT .= '</select>';
                                $content['country'] = $OUT;
@@ -192,16 +194,16 @@ LIMIT 1",
                        $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
 
                        displayMessage($content['update_check']);
-               } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
+               } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        displayMessage('{--INVALID_EMAIL_ENTERED--}');
-               } elseif ((isEmailTaken(postRequestParameter('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
+               } elseif ((isEmailTaken(postRequestElement('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
                        // Email address is already registered
                        displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
                } else {
                        // Generate hash
-                       $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
-                       if ((($hash == $content['password']) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) && (isPostRequestParameterSet('pass1'))) {
+                       $hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
+                       if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) {
                                // Only on simple changes normal mode is active = no email or password changed
                                $mode = 'normal';
                                $AND = '';
@@ -213,14 +215,14 @@ LIMIT 1",
                                } // END - if
 
                                // Or did he changed his password?
-                               if (postRequestParameter('email') != $content['email']) {
+                               if (postRequestElement('email') != $content['email']) {
                                        // Jupp
                                        if ($mode == 'normal') {
                                                $mode = 'email';
                                        } else {
                                                $mode .= ';email';
                                        }
-                                       setPostRequestParameter('old_email', $content['email']);
+                                       setPostRequestElement('old_email', $content['email']);
                                } // END - if
 
                                // Update member's profile
@@ -242,18 +244,18 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestParameter('gender'),
-                                                       postRequestParameter('surname'),
-                                                       postRequestParameter('family'),
-                                                       postRequestParameter('street_nr'),
-                                                       bigintval(postRequestParameter('country_code')),
-                                                       bigintval(postRequestParameter('zip')),
-                                                       postRequestParameter('city'),
-                                                       postRequestParameter('email'),
-                                                       bigintval(postRequestParameter('day')),
-                                                       bigintval(postRequestParameter('month')),
-                                                       bigintval(postRequestParameter('year')),
-                                                       bigintval(postRequestParameter('max_mails')),
+                                                       postRequestElement('gender'),
+                                                       postRequestElement('surname'),
+                                                       postRequestElement('family'),
+                                                       postRequestElement('street_nr'),
+                                                       bigintval(postRequestElement('country_code')),
+                                                       bigintval(postRequestElement('zip')),
+                                                       postRequestElement('city'),
+                                                       postRequestElement('email'),
+                                                       bigintval(postRequestElement('day')),
+                                                       bigintval(postRequestElement('month')),
+                                                       bigintval(postRequestElement('year')),
+                                                       bigintval(postRequestElement('max_mails')),
                                                        getMemberId()
                                                ), __FILE__, __LINE__);
                                } else {
@@ -274,18 +276,18 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestParameter('gender'),
-                                                       postRequestParameter('surname'),
-                                                       postRequestParameter('family'),
-                                                       postRequestParameter('street_nr'),
-                                                       postRequestParameter('cntry'),
-                                                       bigintval(postRequestParameter('zip')),
-                                                       postRequestParameter('city'),
-                                                       postRequestParameter('email'),
-                                                       bigintval(postRequestParameter('day')),
-                                                       bigintval(postRequestParameter('month')),
-                                                       bigintval(postRequestParameter('year')),
-                                                       bigintval(postRequestParameter('max_mails')),
+                                                       postRequestElement('gender'),
+                                                       postRequestElement('surname'),
+                                                       postRequestElement('family'),
+                                                       postRequestElement('street_nr'),
+                                                       postRequestElement('cntry'),
+                                                       bigintval(postRequestElement('zip')),
+                                                       postRequestElement('city'),
+                                                       postRequestElement('email'),
+                                                       bigintval(postRequestElement('day')),
+                                                       bigintval(postRequestElement('month')),
+                                                       bigintval(postRequestElement('year')),
+                                                       bigintval(postRequestElement('max_mails')),
                                                        getMemberId()
                                                ), __FILE__, __LINE__);
                                }