Was missing :(

[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 06ababa80706fa4f5bb49ca62aa24e6cb801a89c..a8c16076078ca154a9ca2ccda31b027652733db5 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -96,7 +96,7 @@ LIMIT 1',
        } // END - if
 
        // Display it depending on mail (data) type
-       loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), FALSE, $content);
 
        // Free result
        SQL_FREERESULT($result_data);
@@ -151,7 +151,7 @@ LIMIT 1",
        } // END - if
 
        // Display it depending on mail (data) type
-       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
+       loadTemplate('member_mail_normal_' . strtolower($content['data_type']), FALSE, $content);
 
        // Free result
        SQL_FREERESULT($result_data);
@@ -179,14 +179,14 @@ if (!SQL_HASZERONUMS($result)) {
        while ($row = SQL_FETCHARRAY($result)) {
                // Load data from stats table...
                $cat = '';
-               $result_data = false;
+               $result_data = FALSE;
                $message = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
                $data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type'];
                switch ($row['link_type']) {
                        case 'NORMAL':
                                $result_data = SQL_QUERY_ESC("SELECT
        s.`subject`,
-       s.`timestamp_ordered`,
+       s.`timestamp_ordered` AS `timestamp`,
        s.`cat_id`,
        s.`payment_id`,
        p.`sender`
@@ -206,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`, NULL FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
                                $row['link_type'] = 'bonusid';
                                $data = $row['bonus_id'];
@@ -216,7 +216,7 @@ LIMIT 1",
                        default: // Unknown type detected!
                                reportBug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
                                break;
-               }
+               } // END - switch
 
                // Data found to this mail?
                if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
@@ -226,7 +226,7 @@ LIMIT 1",
                        // Subject line found?
                        if (empty($subject)) {
                                // No subject line!
-                               $subject = '{--DEFAULT_SUBJECT_LINE--}';
+                               $subject = '{--DEFAULT_SUBJECT--}';
                        } // END - if
 
                        // Prepare sender id
@@ -255,9 +255,9 @@ LIMIT 1",
 
                        // Load row template
                        if (getConfig('show_points_unconfirmed') == 'Y') {
-                               $OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row', TRUE, $content);
                        } else {
-                               $OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_row_nopoints', TRUE, $content);
                        }
 
                        // Count points
@@ -271,9 +271,9 @@ LIMIT 1",
 
                        // Display points or not?
                        if (getConfig('show_points_unconfirmed') == 'Y') {
-                               $OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404', TRUE, $content);
                        } else {
-                               $OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+                               $OUT .= loadTemplate('member_unconfirmed_404_nopoints', TRUE, $content);
                        }
                }
 
@@ -292,9 +292,9 @@ LIMIT 1",
 
        // Load main template
        if (getConfig('show_points_unconfirmed') == 'Y') {
-               loadTemplate('member_unconfirmed_table', false, $content);
+               loadTemplate('member_unconfirmed_table', FALSE, $content);
        } else {
-               loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+               loadTemplate('member_unconfirmed_table_nopoints', FALSE, $content);
        }
 } else {
        // No mails left to confirm... :)