More rewrites to make lesser use of getMessage()

[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 bdbb8cd8a06ec60ca7abe506efef3a3faaf87be9..db81bda1d978499ef228e7bf6a029c82875c68cb 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -58,12 +58,12 @@ $content = array(
 );
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
 if (isPostRequestParameterSet('save'))   $mode = 'save';   // Save entered data
-if (isPostRequestParameterSet('edit'))   $mode = 'edit';   // Edit data
+if (isFormSent('edit'))   $mode = 'edit';   // Edit data
 if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification
 
 switch ($mode) {
@@ -72,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?
@@ -204,7 +203,7 @@ LIMIT 1",
                        loadTemplate('admin_settings_saved', false, $content['update_check']);
                } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
-                       loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
+                       loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}');
                } else {
                        // Generate hash
                        $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
@@ -306,11 +305,11 @@ LIMIT 1",
                                        sendModeMails ('mydata', $modes);
                                } else {
                                        // Something went wrong
-                                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_UPDATE_FAILED'));
+                                       loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}');
                                }
                        } else {
                                // Entered wrong pass for updating profile
-                               loadTemplate('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+                               loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}');
                        }
                }
                break;
@@ -318,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=mydata&code=' . getCode('PROFILE_UPDATED');
                break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
        // Load generated URL
-       redirectToUrl($URL);
+       redirectToUrl($url);
 } // END - if
 
 // [EOF]