More improved SQL queries

[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 10ddba988c63fc8a02a016d8a8bdb7dcec4279ed..a1ed1b1c45afc91781daa2be323929ef6792631c 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -43,10 +43,13 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
+// Init counter for deleted mails
+$cnt = 0;
+
 if (!empty($_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($_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($_GET['mid'])), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -72,11 +75,11 @@ if (!empty($_GET['mid'])) {
 
                // Load email template and send the email away
                $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
-               SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
+               SEND_EMAIL($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
+               $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($_GET['mid'])), __FILE__, __LINE__);
@@ -121,41 +124,46 @@ WHERE s.pool_id=%s LIMIT 1",
                                        }
                                } else {
                                        // No points repayed!
-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_POINTS_REPAYED);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_POINTS_REPAYED'));
                                }
                        } else {
                                // Points shredded!
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_POINTS_SHREDDED, $totalPoints));
                        }
 
-                       // Delete mail from queue
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
-                               array(bigintval($_GET['mid'])), __FILE__, __LINE__);
-
                        // Remove links from DB
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%s",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",
                                array(bigintval($stats_id)), __FILE__, __LINE__);
+                       $cnt += SQL_AFFECTEDROWS();
 
-                       // Output link for manually removing stats entry
-                       LOAD_TEMPLATE("admin_settings_saved", false, "<A href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</A>");
+                       // Load template for link
+                       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");
                } // END - if
 
                // Free the result
                SQL_FREERESULT($result_pool);
+
+               // Delete mail from queue
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+                       array(bigintval($_GET['mid'])), __FILE__, __LINE__);
+               $cnt += SQL_AFFECTEDROWS();
+
+               // Output link for manually removing stats entry
+               OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
        } else {
                // Mail already deleted!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NORMAL_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
 } elseif (!empty($_GET['pid'])) {
        // Remove stats entries
-       $result = 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($_GET['pid'])), __FILE__, __LINE__);
 
        // Output message
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_USER_STATS_REMOVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_USER_STATS_REMOVED'));
 } elseif ((!empty($_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",
+       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s",
                array(bigintval($_GET['bid'])), __FILE__, __LINE__);
 
        // Delete mail only once
@@ -166,31 +174,37 @@ WHERE s.pool_id=%s LIMIT 1",
                // Reset sent mails for recipient(s)
                REDUCT_RECIPIENT_RECEIVED_MAILS ("bonus_id", $_GET['bid'], $sent);
 
+               // Init counter for deleted mails
+               $cnt = 0;
+
                // Delete bonus mail entirely from database
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
+               $cnt += SQL_AFFECTEDROWS();
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
+               $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
                define('__ID'     , $id);
                define('__SUBJECT', $subject);
                define('__URL'    , DEREFERER($url));
                define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+               define('__CNT'    , $cnt);
 
                // Load template
                LOAD_TEMPLATE("admin_del_email_bonus");
        } else {
                // Mail already deleted!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
        }
 
        // Free result
        SQL_FREERESULT($result);
 } elseif ((!empty($_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($_GET['nid'])), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s",
+               array(bigintval($_GET['nid'])), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -198,27 +212,33 @@ WHERE s.pool_id=%s LIMIT 1",
                list ($id, $subject, $url, $timestamp) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
+               // Init counter for deleted mails
+               $cnt = 0;
+
                // Delete bonus mail entirely from database
-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
-                array(bigintval($_GET['nid'])), __FILE__, __LINE__);
-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
-                array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                       array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+               $cnt += SQL_AFFECTEDROWS();
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+                       array(bigintval($_GET['nid'])), __FILE__, __LINE__);
+               $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
                define('__ID'     , $id);
                define('__SUBJECT', $subject);
                define('__URL'    , DEREFERER($url));
                define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+               define('__CNT'    , $cnt);
 
                // Load template
                LOAD_TEMPLATE("admin_del_email_notify");
        } else {
                // Mail already deleted!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NOTIFY_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));
        }
 } else {
        // No mail orders fond
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_WRONG_CALL'));
 }
 
 //