Fix for missing variable, thanks to wernisman

[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 42bb935ebc86ca25a0fe9b3ce21273d78876908d..b02f602fbffa848c70f22180e692866a969b76a0 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/12/2004 *
- * ================                             Last change: 02/27/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 02/12/2004 *
+ * ===================                          Last change: 02/27/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-del_email.php                               *
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Init counter for deleted mails
-$cnt = 0;
+$cnt = '0';
 
 if (isGetRequestElementSet('mid')) {
        // Load email data
@@ -65,7 +65,7 @@ if (isGetRequestElementSet('mid')) {
                $content['subject']   = $subject;
                $content['url']       = generateDerefererUrl($url);
                $content['url_raw']   = $url;
-               $content['timestamp'] = generateDateTime($timestamp, '0');
+               $content['timestamp'] = generateDateTime($timestamp, 0);
 
                // Load template
                loadTemplate('admin_del_email_normal', false, $content);
@@ -107,22 +107,22 @@ LIMIT 1",
                                        // Shall we payback to user or jackpot?
                                        if (getConfig('repay_deleted_mails') == 'JACKPOT') {
                                                // Set jackpot
-                                               $sender = 0;
+                                               $sender = '0';
                                        } // END - if
 
                                        // Pay back points
                                        //* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
-                                       addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, '0', false,'direct');
+                                       addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
 
                                        // Output message
                                        if (getConfig('repay_deleted_mails') == 'REPAY') {
                                                // Repayed
-                                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_REPAYED'),
+                                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
                                                        translateComma($totalPoints)
                                                ));
                                        } else {
                                                // To jackpot
-                                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
+                                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
                                                        translateComma($totalPoints)
                                                ));
                                        }
@@ -132,7 +132,7 @@ LIMIT 1",
                                }
                        } else {
                                // Points shredded!
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_SHREDDED'), $totalPoints));
+                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', translateComma($totalPoints)));
                        }
 
                        // Remove links from DB
@@ -141,7 +141,7 @@ LIMIT 1",
                        $cnt += 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(getRequestElement('mid'))."\">{--ADMIN_REMOVE_STATS_ENTRY--}</a>");
+                       loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestElement('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
                } // END - if
 
                // Free the result
@@ -153,7 +153,7 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
-               outputHtml(sprintf(getMessage('ADMIN_DELETED_MAILS_COUNT'), $cnt));
+               outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt));
        } else {
                // Mail already deleted!
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
@@ -173,13 +173,13 @@ LIMIT 1",
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
                // Load data
-               list($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
+               $content = SQL_FETCHARRAY($result);
 
                // Reset sent mails for recipient(s)
-               reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $sent);
+               reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $content['mails_sent']);
 
                // Init counter for deleted mails
-               $cnt = 0;
+               $cnt = '0';
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
@@ -190,10 +190,8 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['id']        = $id;
-               $content['subject']   = $subject;
-               $content['url']       = generateDerefererUrl($url);
-               $content['timestamp'] = generateDateTime($timestamp, '0');
+               $content['url']       = generateDerefererUrl($content['url']);
+               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
                $content['cnt']       = $cnt;
 
                // Load template
@@ -213,10 +211,10 @@ LIMIT 1",
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
                // Load data
-               list ($id, $subject, $url, $timestamp) = SQL_FETCHROW($result);
+               $content = SQL_FETCHARRAY($result);
 
                // Init counter for deleted mails
-               $cnt = 0;
+               $cnt = '0';
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
@@ -227,10 +225,8 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['id']        = $id;
-               $content['subject']   = $subject;
-               $content['url']       = generateDerefererUrl($url);
-               $content['timestamp'] = generateDateTime($timestamp, '0');
+               $content['url']       = generateDerefererUrl($content['url']);
+               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
                $content['cnt']       = $cnt;
 
                // Load template