New function isValidUserid() introduced, more rewrites to EL:

[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 11de7d3bb749c8a2020d6488a263122798bddd20..c5abb43616ee6b1927755b421573a733c979b7fe 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -48,25 +48,20 @@ $cnt = '0';
 
 if (isGetRequestParameterSet('mid')) {
        // Load email data
-       $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `cat_id`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
                // Load data
-               list ($id, $sender, $subject, $url, $timestamp, $payId) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $content = SQL_FETCHARRAY($result);
 
                // Get points we shall pay back per mail
-               $price = getPaymentPoints($payId, 'price');
+               // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+               // @TODO Unused: cat_id, payment_id
 
                // Prepare data for the template
-               $content['id']        = $id;
-               $content['sender']    = generateUserProfileLink($sender);
-               $content['subject']   = $subject;
-               $content['url']       = generateDerefererUrl($url);
-               $content['url_raw']   = $url;
-               $content['timestamp'] = generateDateTime($timestamp, 0);
+               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                // Load template
                loadTemplate('admin_del_email_normal', false, $content);
@@ -157,6 +152,9 @@ LIMIT 1",
                // Mail already deleted!
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } elseif (isGetRequestParameterSet('pid')) {
        // Remove stats entries
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",