New wrapper function introduced, more EL rewrites:

[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 1cd9e9d53362bdaa1059b1e3bb72ebfcdc8ba73d..bb59e8151c12e29adf10f5f97a6b02178467ad68 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -83,7 +83,7 @@ LIMIT 1",
 } 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 AS `category`, 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
@@ -116,7 +116,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);
@@ -133,9 +133,9 @@ if (isExtensionActive('bonus')) {
 }
 
 // Mails left for confirmation?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Please confirm these mails!
-       $sum = '0'; $OUT = ''; $SW = 2;
+       $sum = '0'; $OUT = '';
 
        // Init content
        $content = array();
@@ -204,8 +204,6 @@ LIMIT 1",
 
                        // Prepare data for template
                        $content = array(
-                               'sw'        => $SW,
-                               'userid'    => getMemberId(),
                                'data'      => bigintval($DATA),
                                'type'      => $type,
                                'subject'   => $subject,
@@ -226,7 +224,6 @@ LIMIT 1",
                } else {
                        // Prepare data for template
                        $content = array(
-                               'sw'    => $SW,
                                'data'  => $DATA,
                                'probl' => $PROBLEM,
                        );
@@ -241,9 +238,6 @@ LIMIT 1",
 
                // Free result
                SQL_FREERESULT($result_data);
-
-               // Switch color
-               $SW = 3 - $SW;
        } // END - while
 
        // Free memory