New wrapper functions introduced, TODOs.txt updated

[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 9d8d6127dd62cfff6ce390764cd5b97b96ce3c63..14cb33b936efb6e2545e291465cea39721a5fe07 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mydata'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('mydata'));
        return;
 } // END - if
 
@@ -71,9 +71,9 @@ switch ($mode) {
                $content['last_update'] = generateDateTime($content['last_update'], 0);
 
                // How far is last change on his profile away from now?
-               if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
+               if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
-                       $content['change'] = loadTemplate('admin_settings_saved', true, '<div class="notice">' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
+                       $content['change'] = displayMessage('<div class="notice">' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getProfileLock(), 0)) . '</div>', true);
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', true);
@@ -123,14 +123,14 @@ LIMIT 1",
                // Free result
                SQL_FREERESULT($result);
 
-               $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+               $content['update_check'] = $content['last_update'] + getProfileLock();
 
                // How far is last change on his profile away from now?
-               if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-                       $content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+               if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+                       $content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getProfileLock(), 0));
 
                        // You cannot change your account
-                       loadTemplate('admin_settings_saved', false, $content['update_check']);
+                       displayMessage($content['update_check']);
                } else {
                        // He is allowed to change his profile
                        foreach (array('gender_m','gender_f','gender_c') as $entry) {
@@ -189,17 +189,17 @@ LIMIT 1",
                $content = merge_array($content, getUserDataArray());
 
                // Calculate time to check
-               $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+               $content['update_check'] = $content['last_update'] + getProfileLock();
 
                // 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);
+               if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+                       $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
 
                        // You cannot change your account
-                       loadTemplate('admin_settings_saved', false, $content['update_check']);
+                       displayMessage($content['update_check']);
                } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
-                       loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}');
+                       displayMessage('{--INVALID_EMAIL_ENTERED--}');
                } else {
                        // Generate hash
                        $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
@@ -301,11 +301,11 @@ LIMIT 1",
                                        sendModeMails ('mydata', $modes);
                                } else {
                                        // Something went wrong
-                                       loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}');
+                                       displayMessage('{--MEMBER_UPDATE_FAILED--}');
                                }
                        } else {
                                // Entered wrong pass for updating profile
-                               loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}');
+                               displayMessage('{--MEBER_UPDATE_PWD_WRONG--}');
                        }
                }
                break;