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

[mailer.git] / inc / modules / admin / what-list_unconfirmed.php

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 4fbe78833c52645c4b3b0b11c83615b1e107dde3..ccc74f2e1fec3b14c58048c18ba29ec397f0692e 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -46,7 +46,7 @@ ADD_DESCR("admin", __FILE__);
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
 
-if (!empty($_GET['mid'])) {
+if (REQUEST_ISSET_GET(('mid'))) {
        // List confirmation links from your member's mail orders
        define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_MEMBER_LINKS'));
 
@@ -54,22 +54,22 @@ if (!empty($_GET['mid'])) {
        $SQL = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec  FROM `{!_MYSQL_PREFIX!}_pool` AS p
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_stats` AS s
 ON p.id=s.pool_id
-WHERE p.id='".$_GET['mid']."' LIMIT 1";
+WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
 
        // Column, type and ID for member's mail
        $col = "stats_id"; $type = "NORMAL"; $ID = "-1";
 
        // Load admin_list_unconfirmed template
-       $listed = true; $DATA = $_GET['mid']; $LINK = "mailid";
-} elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus"))) {
+       $listed = true; $DATA = REQUEST_GET('mid'); $LINK = "mailid";
+} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE("bonus"))) {
        // List confirmation links from bonus mails
        define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       $SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".$_GET['bid']."' LIMIT 1";
+       $SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".REQUEST_GET('bid')."' LIMIT 1";
 
        // Column, type and ID for member's mail
-       $col = "bonus_id"; $type = "BONUS"; $ID = $_GET['bid'];
+       $col = "bonus_id"; $type = "BONUS"; $ID = REQUEST_GET('bid');
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $ID; $LINK = "bonusid";
@@ -143,7 +143,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 
                // Load final template
                LOAD_TEMPLATE("admin_list_unconfirmed");
-       } elseif ($_GET['mid'] > 0) {
+       } elseif (REQUEST_GET('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing
                $result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
                        array(bigintval($ID)), __FILE__, __LINE__);
@@ -163,7 +163,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                // Free memory
                SQL_FREERESULT($result1);
                SQL_FREERESULT($result2);
-       } elseif (!empty($_GET['bid'])) {
+       } elseif (REQUEST_ISSET_GET(('bid'))) {
                // Data in bonus table not found
                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
        }