Mailer project continued:

[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 1da948a63c2c92ca0e4bac219464bded1e700596..06ababa80706fa4f5bb49ca62aa24e6cb801a89c 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -54,13 +54,22 @@ if (!isExtensionActive('mailid')) {
 // Shall we display a mail?
 if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('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`
+       $result_data = SQL_QUERY_ESC('SELECT
+       `id`,
+       `subject`,
+       `timestamp`,
+       `cat_id`,
+       `points`,
+       `text`,
+       `is_notify`,
+       `data_type`,
+       `time`,
+       `url`
 FROM
        `{?_MYSQL_PREFIX?}_bonus`
 WHERE
        `id`=%s
-LIMIT 1",
+LIMIT 1',
                array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
        // Load data
@@ -150,11 +159,11 @@ LIMIT 1",
 
 if (isExtensionActive('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(getMemberId()), __FILE__, __LINE__);
 } else {
        // Don't load bonus id if ext-bonus is not installed
-       $result = SQL_QUERY_ESC("SELECT `stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
+       $result = SQL_QUERY_ESC("SELECT `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
                array(getMemberId()), __FILE__, __LINE__);
 }
 
@@ -176,15 +185,19 @@ if (!SQL_HASZERONUMS($result)) {
                switch ($row['link_type']) {
                        case 'NORMAL':
                                $result_data = SQL_QUERY_ESC("SELECT
-       s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
+       s.`subject`,
+       s.`timestamp_ordered`,
+       s.`cat_id`,
+       s.`payment_id`,
+       p.`sender`
 FROM
-       `{?_MYSQL_PREFIX?}_user_stats` AS s
+       `{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_pool` AS p
+       `{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
-       s.pool_id=p.id
+       s.`pool_id`=p.`id`
 WHERE
-       s.id=%s
+       s.`id`=%s
 LIMIT 1",
                                        array(bigintval($row['stats_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'mailid';
@@ -193,7 +206,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($row['bonus_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'bonusid';
                                $data = $row['bonus_id'];