Renamed many stuff (again), added points/user breakup:

[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 03cb14da6ee2d435e4f98ff9d9425eb9ac8de36b..a8c16076078ca154a9ca2ccda31b027652733db5 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -186,7 +186,7 @@ if (!SQL_HASZERONUMS($result)) {
                        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