Extension 'ext-coupon' moved to branch, SQLs improved:

[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 3689c64ea5bd0435eae4c2c49ee11e2bbaaadd3a..2cad2b449d48c892b095099c379141d9795fa742 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -81,7 +81,8 @@ LIMIT 1",
 } elseif (isGetRequestParameterSet('mailid')) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT
 } elseif (isGetRequestParameterSet('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
+       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
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN


@@ -165,7 +166,7 @@ LIMIT 1",
                                break;
 
                        case 'BONUS':
                                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($row['bonus_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'bonusid';
                                $data = $row['bonus_id'];
                                        array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'bonusid';
                                $data = $row['bonus_id'];


@@ -179,7 +180,7 @@ LIMIT 1",
 
                // Data found to this mail?
                if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
 
                // Data found to this mail?
                if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {

-                       // Mail was found!
+                       // Mail was found

                        list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
 
                        // Subject line found?
                        list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
 
                        // Subject line found?


@@ -257,7 +258,7 @@ LIMIT 1",
        }
 } else {
        // No mails left to confirm... :)
        }
 } else {
        // No mails left to confirm... :)

-       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
+       displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');

 }
 
 // [EOF]
 }
 
 // [EOF]