Complete rewrite of and , wrapper functions added, see bug #101

[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 a1ed1b1c45afc91781daa2be323929ef6792631c..3b2e9fe47defa1c9bf30cd08447d73c419f3b6dc 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 (!empty($_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($_GET['mid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -82,7 +82,7 @@ if (!empty($_GET['mid'])) {
 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__);
+ array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_pool) == 1) {
                        // Fetch stats id
                        list($stats_id) = SQL_FETCHROW($result_pool);
@@ -91,7 +91,7 @@ WHERE s.pool_id=%s LIMIT 1",
                        $links = GET_TOTAL_DATA($stats_id, "user_links", "userid", "stats_id", true);
 
                        // Reset sent mails for recipient(s)
-                       REDUCT_RECIPIENT_RECEIVED_MAILS("stats_id", $_GET['mid'], $links);
+                       REDUCT_RECIPIENT_RECEIVED_MAILS("stats_id", REQUEST_GET('mid'), $links);
 
                        // Calc total points and pay them back
                        $totalPoints = $links * $price;
@@ -137,7 +137,7 @@ WHERE s.pool_id=%s LIMIT 1",
                        $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(REQUEST_GET('mid'))."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");
                } // END - if
 
                // Free the result
@@ -145,7 +145,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($_GET['mid'])), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Output link for manually removing stats entry
@@ -154,17 +154,17 @@ WHERE s.pool_id=%s LIMIT 1",
                // Mail already deleted!
                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
-} elseif (!empty($_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",
-               array(bigintval($_GET['pid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_USER_STATS_REMOVED'));
-} elseif ((!empty($_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($_GET['bid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -172,17 +172,17 @@ WHERE s.pool_id=%s LIMIT 1",
                list ($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
 
                // Reset sent mails for recipient(s)
-               REDUCT_RECIPIENT_RECEIVED_MAILS ("bonus_id", $_GET['bid'], $sent);
+               REDUCT_RECIPIENT_RECEIVED_MAILS ("bonus_id", REQUEST_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",
-                       array(bigintval($_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($_GET['bid'])), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
@@ -201,10 +201,10 @@ WHERE s.pool_id=%s LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result);
-} elseif ((!empty($_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($_GET['nid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
@@ -217,10 +217,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($_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($_GET['nid'])), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template