New wrapper functions introduced, TODOs.txt updated

[mailer.git] / inc / modules / sponsor / settings.php

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index d4bc9345394a7b4df8d88d889039e3df3c4b8dad..8a4c76b1e04219c6041716e7a187e0eccef47ef8 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
@@ -99,10 +99,10 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, $message);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
                        } else {
                                // No message generated
-                               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
                        }
                } else {
                        // Make yes/no selection
@@ -116,11 +116,11 @@ if (SQL_NUMROWS($result) == 1) {
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+               $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS), true);
        }
 } else {
        // Sponsor account not found
-       $GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
+       $GLOBALS['sponsor_output'] = displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')), true);
 }
 
 // Free memory