Previous fix fixed, a lot constants rewritten (unfinished)

[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 3728a410aa0ddfd70c88522334518682734b3095..2ea5c6d34a34f602e48c76e20a8df721a0861f2f 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -48,7 +48,7 @@ ADD_DESCR("member", __FILE__);
 if ((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__);
 
@@ -79,10 +79,10 @@ WHERE id=%s LIMIT 1",
 } elseif (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__);
@@ -113,11 +113,11 @@ 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",
+       $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",
+       $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__);
 }
 
@@ -132,8 +132,8 @@ if (SQL_NUMROWS($result) > 0) {
                {
                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",
@@ -142,7 +142,7 @@ LIMIT 1",
                        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;
@@ -240,7 +240,7 @@ LIMIT 1",
        }
 } 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'));
 }
 
 //