Rewrote a lot parts to extract 'payments' table (+ handling) into own extension:

[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 f64ae4ce2fe8c0fe80dd6bdfc2bb952b0cdd0127..d2fe6db28ba3467557ed849761b221e96b704b05 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -103,14 +103,13 @@ LIMIT 1',
 } elseif (isGetRequestElementSet('mailid')) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT
-       s.`id`,
-       s.`subject`,
+       `s`.`id`,
+       `s`.`subject`,
        `p`.`text`,
-       s.`timestamp_ordered` AS `timestamp`,
-       s.`cat_id`,
-       pay.`price` AS `points`,
+       `s`.`timestamp_ordered` AS `timestamp`,
+       `s`.`cat_id`,
+       `p`.`payment_id`,
        `p`.`sender`,
-       pay.`time`,
        `p`.`data_type`
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS `s`
@@ -118,18 +117,18 @@ LEFT JOIN
        `{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
        s.pool_id=p.id
-LEFT JOIN
-       `{?_MYSQL_PREFIX?}_payments` AS `pay`
-ON
-       `p`.`payment_id`=pay.`id`
 WHERE
-       s.`id`=%s
+       `s`.`id`=%s
 LIMIT 1",
                array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
 
+       // Get price/time to avoid one JOIN
+       $content['price'] = getPaymentPrice($content['payment_id']);
+       $content['time']  = getPaymentData($content['payment_id'], 'time');
+
        // Translate some data
        $content['timestamp'] = generateDateTime($content['timestamp'], '2');
        $content['userid'] = getMemberId();
@@ -185,19 +184,19 @@ if (!SQL_HASZERONUMS($result)) {
                switch ($row['link_type']) {
                        case 'NORMAL':
                                $result_data = SQL_QUERY_ESC("SELECT
-       s.`subject`,
-       s.`timestamp_ordered` AS `timestamp`,
-       s.`cat_id`,
-       s.`payment_id`,
+       `s`.`subject`,
+       `s`.`timestamp_ordered` AS `timestamp`,
+       `s`.`cat_id`,
+       `s`.`payment_id`,
        `p`.`sender`
 FROM
        `{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
        `{?_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';
@@ -221,59 +220,60 @@ LIMIT 1",
                // Data found to this mail?
                if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
                        // Mail was found
-                       list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
+                       $rowData = SQL_FETCHARRAY($result_data);
 
                        // Subject line found?
-                       if (empty($subject)) {
+                       if (empty($rowData['subject'])) {
                                // No subject line!
-                               $subject = '{--DEFAULT_SUBJECT--}';
+                               $rowData['subject'] = '{--DEFAULT_SUBJECT--}';
                        } // END - if
 
                        // Prepare sender id
-                       if ((isValidId($sender)) && ($row['link_type'] == 'mailid')) {
+                       if ((isValidId($rowData['sender'])) && ($row['link_type'] == 'mailid')) {
                                // Sender id
-                               $sender = bigintval($sender);
+                               $rowData['sender'] = bigintval($rowData['sender']);
                        } elseif ($row['link_type'] == 'bonusid') {
                                // Is admin
-                               $sender = '{--USERNAME_ADMIN_SHORT--}';
+                               $rowData['sender'] = '{--USERNAME_ADMIN_SHORT--}';
                        } else {
                                // Deleted
-                               $sender = '{--EMAIL_STATUS_DELETED--}';
+                               $rowData['sender'] = '{--EMAIL_STATUS_DELETED--}';
                        }
 
                        // Prepare data for template
-                       $content = array(
-                               'data'      => bigintval($data),
+                       // @TODO cat_id is unused
+                       $rowData = array(
+                               'data'              => bigintval($data),
                                // @TODO This 'userid' cannot be saved because of encapsulated EL code
-                               'userid'    => getMemberId(),
-                               'link_type' => $row['link_type'],
-                               'subject'   => $subject,
-                               'sender'    => $sender,
-                               'timestamp' => generateDateTime($timestamp, 2),
-                               'points'    => $pay,
+                               'userid'            => getMemberId(),
+                               'link_type'         => $row['link_type'],
+                               'subject'           => $rowData['subject'],
+                               'sender'            => $rowData['sender'],
+                               'timestamp_ordered' => generateDateTime($rowData['timestamp_ordered'], 2),
+                               'payment_id'        => $rowData['payment_id'],
                        );
 
                        // Load row template
                        if (isShowPointsUnconfirmedEnabled()) {
-                               $OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $content);
+                               $OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $rowData);
                        } else {
-                               $OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $content);
+                               $OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $rowData);
                        }
 
-                       // Count points
-                       $sum += $pay;
+                       // Count points (price)
+                       $sum += getPaymentPrice($rowData['payment_id']);
                } else {
                        // Prepare data for template
-                       $content = array(
+                       $rowData = array(
                                'data'    => $data,
                                'message' => $message,
                        );
 
                        // Display points or not?
                        if (isShowPointsUnconfirmedEnabled()) {
-                               $OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $content);
+                               $OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $rowData);
                        } else {
-                               $OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $content);
+                               $OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $rowData);
                        }
                }