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 56fd39be7b4b9fd383166f336e2a740b515cca35..a1ed1b1c45afc91781daa2be323929ef6792631c 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
@@ -75,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__);
@@ -124,7 +124,7 @@ 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!
@@ -132,19 +132,19 @@ 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();
 
                        // 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>");
+                       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",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
                        array(bigintval($_GET['mid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
@@ -152,18 +152,18 @@ WHERE s.pool_id=%s LIMIT 1",
                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
-       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
@@ -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();
 
@@ -196,14 +196,14 @@ WHERE s.pool_id=%s LIMIT 1",
                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",
+       $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();
 
@@ -234,11 +234,11 @@ WHERE s.pool_id=%s LIMIT 1",
                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'));
 }
 
 //