Heavy rewrite:

[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 1019bd17cfd76cad4d75991504b083b0a58fc46c..aca046e8e81999a250ce9e75d875b274c6080d52 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -46,10 +46,10 @@ ADD_DESCR('admin', __FILE__);
 // Init counter for deleted mails
 $cnt = 0;
 
-if (REQUEST_ISSET_GET(('mid'))) {
+if (REQUEST_ISSET_GET('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",
-       array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `payment_id` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
+               array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -78,20 +78,27 @@ if (REQUEST_ISSET_GET(('mid'))) {
                sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $msg_user);
 
                // Fetch right stats_id from pool
-               $result_pool = SQL_QUERY_ESC("SELECT s.id FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
-ON s.pool_id=p.id
-WHERE s.pool_id=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
+               $result_pool = SQL_QUERY_ESC("SELECT
+       s.id
+FROM
+       `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN
+       `{!_MYSQL_PREFIX!}_pool` AS p
+ON
+       s.pool_id=p.id
+WHERE
+       s.pool_id=%s
+LIMIT 1",
+                       array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_pool) == 1) {
                        // Fetch stats id
                        list($stats_id) = SQL_FETCHROW($result_pool);
 
                        // Get all user links
-                       $links = GET_TOTAL_DATA($stats_id, "user_links", 'userid', "stats_id", true);
+                       $links = GET_TOTAL_DATA($stats_id, 'user_links', 'userid', 'stats_id', true);
 
                        // Reset sent mails for recipient(s)
-                       reduceRecipientReceivedMails("stats_id", REQUEST_GET('mid'), $links);
+                       reduceRecipientReceivedMails('stats_id', REQUEST_GET('mid'), $links);
 
                        // Calc total points and pay them back
                        $totalPoints = $links * $price;
@@ -145,7 +152,7 @@ WHERE s.pool_id=%s LIMIT 1",
 
                // Delete mail from queue
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
@@ -154,22 +161,22 @@ WHERE s.pool_id=%s LIMIT 1",
                // Mail already deleted!
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
-} elseif (REQUEST_ISSET_GET(('pid'))) {
+} elseif (REQUEST_ISSET_GET('pid')) {
        // Remove stats entries
-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `pool_id`=%s LIMIT 1",
        array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
        // Output message
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
-} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE('bonus'))) {
+} elseif ((REQUEST_ISSET_GET('bid')) && (EXT_IS_ACTIVE('bonus'))) {
        // Load data from bonus mail
-       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s",
-       array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s",
+               array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
                // Load data
-               list ($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
+               list($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
 
                // Reset sent mails for recipient(s)
                reduceRecipientReceivedMails('bonus_id', REQUEST_GET('bid'), $sent);
@@ -179,10 +186,10 @@ WHERE s.pool_id=%s LIMIT 1",
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
-               array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s",
+                       array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
@@ -193,7 +200,7 @@ WHERE s.pool_id=%s LIMIT 1",
                define('__CNT'    , $cnt);
 
                // Load template
-               LOAD_TEMPLATE("admin_del_email_bonus");
+               LOAD_TEMPLATE('admin_del_email_bonus');
        } else {
                // Mail already deleted!
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
@@ -201,10 +208,10 @@ WHERE s.pool_id=%s LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result);
-} elseif ((REQUEST_ISSET_GET(('nid'))) && (GET_EXT_VERSION('bonus') >= '0.8.7')) {
+} elseif ((REQUEST_ISSET_GET('nid')) && (GET_EXT_VERSION('bonus') >= '0.8.7')) {
        // Load data from bonus mail
-       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s",
-       array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s",
+               array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -217,10 +224,10 @@ WHERE s.pool_id=%s LIMIT 1",
 
                // Delete bonus mail entirely from database
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
-               array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
-               array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s",
+                       array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
@@ -231,7 +238,7 @@ WHERE s.pool_id=%s LIMIT 1",
                define('__CNT'    , $cnt);
 
                // Load template
-               LOAD_TEMPLATE("admin_del_email_notify");
+               LOAD_TEMPLATE('admin_del_email_notify');
        } else {
                // Mail already deleted!
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));