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

[mailer.git] / inc / modules / member / what-unconfirmed.php

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index f381e4322480472c52f19a8610b752aeef49717f..88249052ccb9097b3fe3806ca102f6fd732439fa 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -45,12 +45,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Shall we display a mail?
-if ((isset($_GET['bonusid'])) && (EXT_IS_ACTIVE("bonus"))) {
+if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE("bonus"))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT id, subject, timestamp, cat_id, points, text, is_notify, data_type, time, url
-FROM "._MYSQL_PREFIX."_bonus
+FROM `{!_MYSQL_PREFIX!}_bonus`
 WHERE id=%s LIMIT 1",
-               array(bigintval($_GET['bonusid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -76,16 +76,16 @@ WHERE id=%s LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result_data);
-} elseif (isset($_GET['mailid'])) {
+} elseif (REQUEST_ISSET_GET(('mailid'))) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
-FROM "._MYSQL_PREFIX."_user_stats AS s
-LEFT JOIN "._MYSQL_PREFIX."_pool AS p
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
 ON s.pool_id=p.id
-LEFT JOIN "._MYSQL_PREFIX."_payments AS pay
+LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay
 ON p.payment_id=pay.id
 WHERE s.id=%s LIMIT 1",
-               array(bigintval($_GET['mailid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -113,12 +113,12 @@ WHERE s.id=%s LIMIT 1",
 
 if (EXT_IS_ACTIVE("bonus")) {
        // Load bonus ID
-       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",
+               array($GLOBALS['userid']), __FILE__, __LINE__);
 } else {
        // Don't load bonus ID
-       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s ORDER BY stats_id DESC",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC",
+               array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
@@ -127,25 +127,29 @@ if (SQL_NUMROWS($result) > 0) {
        $sum = 0; $SW = 2; $OUT = "";
        while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                // Load data from stats table...
-               $cat = "";
+               $cat = ""; $result_data = false;
                switch ($type)
                {
                case "NORMAL":
                        $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
-FROM "._MYSQL_PREFIX."_user_stats AS s
-LEFT JOIN "._MYSQL_PREFIX."_pool AS p
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
 ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
+                               array(bigintval($id)), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
                        break;
 
                case "BONUS":
-                       $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
+                       $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                         array(bigintval($id2)), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
                        break;
+
+               default: // Unknown type detected!
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
+                       break;
                }
 
                // Data found to this mail?
@@ -188,7 +192,7 @@ LIMIT 1",
                        );
 
                        // Load row template
-                       if ($_CONFIG['show_points_unconfirmed'] == "Y") {
+                       if (getConfig('show_points_unconfirmed') == "Y") {
                                $OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content);
                        } else {
                                $OUT .= LOAD_TEMPLATE("member_unconfirmed_row_nopoints", true, $content);
@@ -205,7 +209,7 @@ LIMIT 1",
                        );
 
                        // Display points or not?
-                       if ($_CONFIG['show_points_unconfirmed'] == "Y") {
+                       if (getConfig('show_points_unconfirmed') == "Y") {
                                $OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content);
                        } else {
                                $OUT .= LOAD_TEMPLATE("member_unconfirmed_404_nopoints", true, $content);
@@ -229,16 +233,14 @@ LIMIT 1",
        define('__UNCONFIRMED_ROWS', $OUT);
 
        // Load main template
-       if ($_CONFIG['show_points_unconfirmed'] == "Y") {
+       if (getConfig('show_points_unconfirmed') == "Y") {
                LOAD_TEMPLATE("member_unconfirmed_table");
        } else {
                LOAD_TEMPLATE("member_unconfirmed_table_nopoints");
        }
-}
- else
-{
+} else {
        // No mails left to confirm... :)
-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_TO_CONFIRM);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
 }
 
 //