New wrapper functions introduced, TODOs.txt updated

[mailer.git] / inc / modules / admin.php

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index ad48308d35370e76953e9e2c1d3d2fcb9fce1f46..9068e4536a9e7ec58914b57eec7af1ce20092ef4 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -173,7 +173,7 @@ if (!isAdminRegistered()) {
                } // END - if
 
                // Output message in seperate template
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+               displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
@@ -182,7 +182,7 @@ if (!isAdminRegistered()) {
        // Is the form submitted?
        if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
                // Output result
-               loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestParameter('email')));
+               displayMessage(sendAdminPasswordResetLink(postRequestParameter('email')));
        } elseif (isGetRequestParameterSet('hash')) {
                // Output form for hash validation
                loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
@@ -202,7 +202,7 @@ if (!isAdminRegistered()) {
                        loadTemplate('admin_reset_password_form', false, $content);
                } else {
                        // Cannot validate the login data and hash
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
+                       displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
                }
        } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
@@ -211,7 +211,7 @@ if (!isAdminRegistered()) {
                        loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
+                       displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
                }
        } else {
                // Output reset password form
@@ -228,7 +228,7 @@ if (!isAdminRegistered()) {
                // Registration of first admin is done
                if (getRequestParameter('register') == 'done') {
                        // Regisration done!
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
+                       displayMessage('{--ADMIN_REGISTER_DONE--}');
                } // END - if
        } // END - if
 
@@ -417,13 +417,13 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+                       displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
                        destroyAdminSession();
                        break;
 
                case 'password': // Wrong password
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
+                       displayMessage('{--WRONG_PASS--}');
                        destroyAdminSession();
                        break;