Fixes for stripped HTML tags, and false warnings in debug log

[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 60b67f7a80d53de7a34421306eaf14aac94fc161..ccc74f2e1fec3b14c58048c18ba29ec397f0692e 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {
-       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mailid");
        return;
 }
 
@@ -46,30 +46,30 @@ 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', LIST_UNCONFIRMED_MEMBER_LINKS);
+       define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_MEMBER_LINKS'));
 
        // SQL query for mail data
        $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', LIST_UNCONFIRMED_BONUS_LINKS);
+       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";
@@ -79,7 +79,7 @@ WHERE p.id='".$_GET['mid']."' LIMIT 1";
 }
 
 // Shall I display links or not?
-if ($listed) {
+if ($listed === true) {
        // Load mail data
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
@@ -93,7 +93,7 @@ if ($listed) {
                define('__LIST_UNCON_SENDER' , $sender);
                define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
                define('__LIST_UNCON_TEXT'   , COMPILE_CODE($text));
-               define('__LIST_UNCON_URL'    , urlencode(base64_encode($url)));
+               define('__LIST_UNCON_URL'    , encodeString($url));
                define('__LIST_UNCON_STAMP'  , MAKE_DATETIME($stamp, "2"));
 
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
@@ -143,18 +143,18 @@ 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__);
+                       array(bigintval($ID)), __FILE__, __LINE__);
                $result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
-                array(bigintval($ID)), __FILE__, __LINE__);
+                       array(bigintval($ID)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result1) == 1) {
                        // pool table
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_POOL_MISSING_1.$ID.ADMIN_UNCONFIRMED_POOL_MISSING_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID)));
                } elseif (SQL_NUMROWS($result2) == 1) {
                        // user_stats table
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_STATS_MISSING_1.$ID.ADMIN_UNCONFIRMED_STATS_MISSING_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID)));
                } else {
                        // both or link is invalid
                        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
@@ -163,10 +163,11 @@ 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'));
        }
 }
+
 //
 ?>