Aliasing should be avoided, better we rename the column or/and use direct column...

[mailer.git] / inc / modules / member / what-stats.php

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index fb156eb909278fbd171e81e284e3d3996005d4e3..8a37457834b40138ecdace2802f72110ab840217 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -63,39 +63,22 @@ ORDER BY
        array(getMemberId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Load all orders
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
-               // Is the ZIP code set? If not, set dashes
-               if (empty($content['zip'])) $content['zip'] =  '---';
-
                // Prepare content for output
-               $content = array(
-                       'sw'          => $SW,
-                       'id'          => $content['id'],
-                       'cat'         => getCategory($content['cat_id']),
-                       'pay'         => getPaymentTitlePrice($content['payment_id']),
-                       'subject'     => $content['subject'],
-                       'url'         => generateDerefererUrl($content['url']),
-                       'timestamp'   => generateDateTime($content['timestamp'], 2),
-                       'target_send' => $content['target_send'],
-                       'type'        => translatePoolType($content['data_type']),
-                       'zip'         => $content['zip']
-               );
+               $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                // Load template
                $OUT .= loadTemplate('member_pool_row', true, $content);
-
-               // Switch color
-               $SW = 3 - $SW;
        } // END - if
 
        // Load main template
        $main_content['pool'] = loadTemplate('member_pool_table', true, $OUT);
 } else {
        // No mails in pool!
-       $main_content['pool'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_POOL'));
+       $main_content['pool'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_POOL--}');
 }
 
 // Free result
@@ -112,13 +95,12 @@ ORDER BY
        `timestamp_ordered` DESC",
        array(getMemberId()), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Mail orders are in pool so we can display them
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
                $content = array(
-                       'sw'                => $SW,
                        'cat_id'            => $content['cat_id'],
                        'payment_id'        => $content['payment_id'],
                        'url'               => $content['url'],
@@ -132,14 +114,13 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Load row template and switch colors
                $OUT .= loadTemplate('member_stats_row', true, $content);
-               $SW = 3 - $SW;
        } // END - if
 
        // Load main template
        $main_content['stats'] = loadTemplate('member_stats_table', true, $OUT);
 } else {
        // No mail orders fond
-       $main_content['stats'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_STATS'));
+       $main_content['stats'] = loadTemplate('admin_settings_saved', true, '{--MEMBER_NO_MAILS_IN_STATS--}');
 }
 
 // Free result