New wrapper functions introduced, TODOs.txt updated

[mailer.git] / inc / modules / admin / what-list_beg.php

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 32f99a1d22f1d810b1ef286f1f98b41578bd8f4c..f349aee801b404d41e0e37f163f79f8c3e119c0e 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -50,7 +50,7 @@ if (isBegRallyeEnabled()) {
                $curr = getMonth() - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_WITHDRAW_PREPARED--}');
+               displayMessage('{--ADMIN_BEG_WITHDRAW_PREPARED--}');
        } // END - if
 
        // Autopurge installed?
@@ -113,25 +113,25 @@ ORDER BY
                        $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
                } else {
                        // Display message "no manual withdraw possible"
-                       $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_BEG_ALREADY_WITHDRAW--}');
+                       $content['withdraw_form'] = displayMessage('{--ADMIN_BEG_ALREADY_WITHDRAW--}', true);
                }
 
                // Prepare constant for timemark
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
-                       $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, generateExtensionInactiveNotInstalledMessage('autopurge'));
+                       $content['autopurge_timeout'] = displayMessage(generateExtensionInactiveNotInstalledMessage('autopurge'), true);
                }
 
                // Load final template
                loadTemplate('admin_list_beg', false, $content);
        } else {
                // No one has joined the begging rallye...
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_NO_RALLYE--}');
+               displayMessage('{--ADMIN_BEG_NO_RALLYE--}');
        }
 } else {
        // Rallye deactivated
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
+       displayMessage('{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]