A lot templates rewritten, TODOs.txt updated, XHTML fixes:

[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 061743ca9afbd2dddb5578a21932d3c5eedd6437..3390b853bbb840b22d613c567d13715829c2be92 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -67,12 +67,6 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 
 switch ($mode) {
        case 'show': // Show his data
-               // Get user data
-               if (!fetchUserData(getMemberId())) {
-                       // Something really bad happended
-                       debug_report_bug('No user account ' . getMemberId() . ' found.');
-               } // END - if
-
                // Get line
                $content = merge_array($content, getUserDataArray());
 
@@ -83,7 +77,7 @@ switch ($mode) {
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
                        // You cannot change your account
-                       $content['change'] = loadTemplate('admin_settings_saved', true, "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0))."</div>");
+                       $content['change'] = loadTemplate('admin_settings_saved', true, '<div class="member_failed">' . sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', true);
@@ -140,7 +134,7 @@ LIMIT 1",
                        $content['update_check'] = sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
 
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked', false, $content);
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
                } else {
                        // He is allowed to change his profile
                        foreach (array('gender_m','gender_f','gender_c') as $entry) {
@@ -195,12 +189,6 @@ LIMIT 1",
                break;
 
        case 'save': // Save entered data
-               // Load old email / password
-               if (!fetchUserData(getMemberId())) {
-                       // Something really bad happened
-                       debug_report_bug('No user account ' . getMemberId() . ' found.');
-               } // END - if
-
                // Get line
                $content = merge_array($content, getUserDataArray());
 
@@ -210,8 +198,9 @@ LIMIT 1",
                // How far is last change on his profile away from now?
                if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
                        $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
+
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked', false, $content);
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
                } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
                        // Invalid email address!
                        loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));