New wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index a032f9a8c37c9bea6fea6b0db06b0bf92443f4ac..a6d57eddf3f7012fd7d9e45ebb197936f534ca54 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -99,7 +99,7 @@ LIMIT 1",
                        // Shall we pay the points back to the user?
                        if ($totalPoints == 0) {
                                // No points repayed!
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_POINTS_REPAYED--}');
+                               displayMessage('{--ADMIN_NO_POINTS_REPAYED--}');
                        } elseif (getConfig('repay_deleted_mails') != 'SHRED') {
                                //* DEBUG: */ debugOutput($stats_id . ':' . $totalPoints . '/' . $links . '/' . $content['price']);
                                // Shall we payback to user or jackpot?
@@ -115,18 +115,18 @@ LIMIT 1",
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
                                        // Repayed
-                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
+                                       displayMessage(getMaskedMessage('ADMIN_POINTS_REPAYED',
                                                '{%pipe,translateComma=' . $totalPoints . '%}'
                                        ));
                                } else {
                                        // To jackpot
-                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
+                                       displayMessage(getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
                                                '{%pipe,translateComma=' . $totalPoints . '%}'
                                        ));
                                }
                        } else {
                                // Points shredded!
-                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
+                               displayMessage(getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
                        }
 
                        // Remove links from DB
@@ -135,7 +135,7 @@ LIMIT 1",
                        $count += SQL_AFFECTEDROWS();
 
                        // Load template for link
-                       loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestParameter('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
+                       displayMessage('<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestParameter('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
                } // END - if
 
                // Free the result
@@ -150,7 +150,7 @@ LIMIT 1",
                outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $count));
        } else {
                // Mail already deleted!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
+               displayMessage('{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
        }
 
        // Free result
@@ -161,7 +161,7 @@ LIMIT 1",
                array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
 
        // Output message
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_STATS_REMOVED--}');
+       displayMessage('{--ADMIN_USER_STATS_REMOVED--}');
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
        // Load data from bonus mail
        $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
@@ -194,7 +194,7 @@ LIMIT 1",
                loadTemplate('admin_delete_email_bonus', false, $content);
        } else {
                // Mail already deleted!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
+               displayMessage('{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
        }
 
        // Free result
@@ -228,14 +228,14 @@ LIMIT 1",
                loadTemplate('admin_delete_email_notify', false, $content);
        } else {
                // Mail already deleted!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
+               displayMessage('{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
        }
 
        // Free result
        SQL_FREERESULT($result);
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
+       displayMessage('{--ADMIN_WRONG_CALL--}');
 }
 
 // [EOF]