Even more rewrites/fixes from EL branch (please report any broken part after you...

[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 61de7486e9107d6b55c365ff2851cfe192dfa643..28a0f11ad17e9ce30c0bb68ab711534a091b217a 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,13 +58,13 @@ $content = array(
 );
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (isPostRequestElementSet('save'))   $mode = 'save';   // Save entered data
-if (isPostRequestElementSet('edit'))   $mode = 'edit';   // Edit data
-if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification
+if (isPostRequestParameterSet('save'))   $mode = 'save';   // Save entered data
+if (isFormSent('edit'))   $mode = 'edit';   // Edit data
+if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification
 
 switch ($mode) {
        case 'show': // Show his data
@@ -71,7 +72,6 @@ switch ($mode) {
                $content = merge_array($content, getUserDataArray());
 
                // Translate some things
-               $content['gender']      = translateGender($content['gender']);
                $content['last_update'] = generateDateTime($content['last_update'], 0);
 
                // How far is last change on his profile away from now?
@@ -201,13 +201,13 @@ LIMIT 1",
 
                        // You cannot change your account
                        loadTemplate('admin_settings_saved', false, $content['update_check']);
-               } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
+               } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
                } else {
                        // Generate hash
-                       $hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
-                       if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) {
+                       $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
+                       if ((($hash == $content['password']) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) && (isPostRequestParameterSet('pass1'))) {
                                // Only on simple changes normal mode is active = no email or password changed
                                $mode = 'normal';
                                $AND = '';
@@ -219,14 +219,14 @@ LIMIT 1",
                                } // END - if
 
                                // Or did he changed his password?
-                               if (postRequestElement('email') != $content['email']) {
+                               if (postRequestParameter('email') != $content['email']) {
                                        // Jupp
                                        if ($mode == 'normal') {
                                                $mode = 'email';
                                        } else {
                                                $mode .= ';email';
                                        }
-                                       setPostRequestElement('old_email', $content['email']);
+                                       setPostRequestParameter('old_email', $content['email']);
                                } // END - if
 
                                // Update member's profile
@@ -248,18 +248,18 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       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')),
+                                                       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')),
                                                        getMemberId()
                                                ), __FILE__, __LINE__);
                                } else {
@@ -280,18 +280,18 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       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')),
+                                                       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')),
                                                        getMemberId()
                                                ), __FILE__, __LINE__);
                                }
@@ -317,13 +317,13 @@ LIMIT 1",
        case 'notify': // Switch off notfication
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N', `last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
                        array(getMemberId()), __FILE__, __LINE__);
-               $URL = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
+               $url = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
                break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
        // Load generated URL
-       redirectToUrl($URL);
+       redirectToUrl($url);
 } // END - if
 
 // [EOF]