Checking new member registrations is now done with list_user (was: chk_regs) and...

[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 5ebc2b96db36ded4bdf84bd07ac9bd467105d73b..f23808f9f2811ba7b660983a0d9f79da25b7d67f 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -8,15 +8,15 @@
  * -------------------------------------------------------------------- *
  * Short description : Delete a bonus or normal mail                    *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Bonus- / Normal-Mail loeschen                    *
+ * Kurzbeschreibung  : Bonus- / Mitglied-Mail loeschen                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
- *  Module by Robert Niedziela, Megacomputing                           *
- *          web : http://mc-p.mcserver.de                               *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,7 +57,7 @@ if (isGetRequestParameterSet('mid')) {
                $content = SQL_FETCHARRAY($result);
 
                // Get points we shall pay back per mail
-               // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+               $content['price'] = getPaymentPoints($content['payment_id'], 'price');
                // @TODO Unused: cat_id, payment_id
 
                // Prepare data for the template
@@ -67,8 +67,8 @@ if (isGetRequestParameterSet('mid')) {
                loadTemplate('admin_delete_email_normal', false, $content);
 
                // Load email template and send the email away
-               $message_user = loadEmailTemplate('order-deleted', $content, $sender);
-               sendEmail($sender, '{--MEMBER_ORDER_DELETED--}', $message_user);
+               $message_user = loadEmailTemplate('member_order_deleted', $content, $content['sender']);
+               sendEmail($content['sender'], '{--MEMBER_ORDER_DELETED--}', $message_user);
 
                // Fetch right stats_id from pool
                $result_pool = SQL_QUERY_ESC("SELECT
@@ -94,39 +94,35 @@ LIMIT 1",
                        reduceRecipientReceivedMails('stats_id', getRequestParameter('mid'), $links);
 
                        // Calc total points and pay them back
-                       $totalPoints = $links * $price;
+                       $totalPoints = $links * $content['price'];
 
                        // 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.'/'.$price);
+                               //* DEBUG: */ debugOutput($stats_id . ':' . $totalPoints . '/' . $links . '/' . $content['price']);
                                // Shall we payback to user or jackpot?
                                if (getConfig('repay_deleted_mails') == 'JACKPOT') {
                                        // Set jackpot
-                                       $sender = '0';
+                                       $content['sender'] = '0';
                                } // END - if
 
                                // Pay back points
-                               //* DEBUG: */ debugOutput('PAYBACK:'.$sender);
-                               addPointsDirectly('mail_deleted', $sender, $totalPoints);
+                               //* DEBUG: */ debugOutput('PAYBACK:'.$content['sender']);
+                               addPointsDirectly('mail_deleted', $content['sender'], $totalPoints);
 
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
                                        // Repayed
-                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
-                                               '{%pipe,translateComma=' . $totalPoints . '%}'
-                                       ));
+                                       displayMessage('{%message,ADMIN_POINTS_REPAYED=' . $totalPoints . '%}');
                                } else {
                                        // To jackpot
-                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
-                                               '{%pipe,translateComma=' . $totalPoints . '%}'
-                                       ));
+                                       displayMessage('{%message,ADMIN_POINTS_TO_JACKPOT=' . $totalPoints . '%}');
                                }
                        } else {
                                // Points shredded!
-                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
+                               displayMessage('{%message,ADMIN_POINTS_SHREDDED=' . $totalPoints . '%}');
                        }
 
                        // Remove links from DB
@@ -135,7 +131,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
@@ -147,10 +143,10 @@ LIMIT 1",
                $count += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
-               outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $count));
+               outputHtml('{%message,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 +157,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 +190,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 +224,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]