All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[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 a14bcb665ea3d05dfd4fa4d1a177052db5dc94ba..5d6784c96390f84f6fe7f5d8a1c398612865cb82 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -48,7 +48,7 @@ $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",
+       $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
@@ -78,8 +78,8 @@ if (!empty($_GET['mid'])) {
                SEND_EMAIL($sender, 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__);
@@ -132,7 +132,7 @@ WHERE s.pool_id=%s LIMIT 1",
                        }
 
                        // 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();
 
@@ -144,7 +144,7 @@ WHERE s.pool_id=%s LIMIT 1",
                SQL_FREERESULT($result_pool);
 
                // Delete mail from queue
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
                        array(bigintval($_GET['mid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
@@ -156,14 +156,14 @@ WHERE s.pool_id=%s LIMIT 1",
        }
 } elseif (!empty($_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($_GET['pid'])), __FILE__, __LINE__);
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, 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
@@ -178,10 +178,10 @@ WHERE s.pool_id=%s LIMIT 1",
                $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__);
                $cnt += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
@@ -203,7 +203,7 @@ WHERE s.pool_id=%s LIMIT 1",
        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",
+       $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
@@ -216,10 +216,10 @@ WHERE s.pool_id=%s LIMIT 1",
                $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['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
                        array(bigintval($_GET['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();