More rewrites, and output-mode fixed (we should documentate this)

[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 03242c07ab49ac569f575626b4fb51d5aa1fec6b..ef5959e75020cb81ea7d71f36e450abe4f1eaf46 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -50,11 +50,15 @@ addMenuDescription('member', __FILE__);
 $main_content = array();
 
 // Load waiting/pending orders
-$result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp, target_send, data_type, zip
-FROM `{?_MYSQL_PREFIX?}_pool`
-WHERE sender=%s AND data_type != 'SEND'
-ORDER BY timestamp DESC",
-array(getUserId()), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT
+       `id`, `cat_id`, `payment_id`, `subject`, `url`, `timestamp`, `target_send`, `data_type`, `zip`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+WHERE
+       `sender`=%s AND `data_type` != 'SEND'
+ORDER BY
+       `timestamp` DESC",
+       array(getUserId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
 if (SQL_NUMROWS($result) > 0) {
@@ -65,18 +69,17 @@ if (SQL_NUMROWS($result) > 0) {
                if (empty($data['zip'])) $data['zip'] =  '---';
 
                // Prepare content for output
-               // @TODO Rewrite in template subj->subject,stamp->timestamp,recs->target_send
                $content = array(
-                       'sw'      => $SW,
-                       'id'      => $data['id'],
-                       'cat'     => getCategory($data['cat_id']),
-                       'pay'     => getPaymentTitlePrice($data['payment_id']),
-                       'subject' => $data['subject'],
-                       'url'     => generateDerefererUrl($data['url']),
-                       'stamp'   => generateDateTime($data['timestamp'], '2'),
-                       'recs'    => $data['target_send'],
-                       'type'    => translatePoolType($data['data_type']),
-                       'zip'     => $data['zip']
+                       'sw'          => $SW,
+                       'id'          => $data['id'],
+                       'cat'         => getCategory($data['cat_id']),
+                       'pay'         => getPaymentTitlePrice($data['payment_id']),
+                       'subject'     => $data['subject'],
+                       'url'         => generateDerefererUrl($data['url']),
+                       'timestamp'   => generateDateTime($data['timestamp'], 2),
+                       'target_send' => $data['target_send'],
+                       'type'        => translatePoolType($data['data_type']),
+                       'zip'         => $data['zip']
                );
 
                // Load template
@@ -112,18 +115,18 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
-               // @TODO Rewrite in template: stamp->timestamp_ordered,recs->max_rec,clix->clicks,perc->percents
+               // @TODO Rewrite in template: clix->clicks
                $content = array(
-                       'sw'       => $SW,
-                       'cat'      => getCategory($content['cat_id']),
-                       'pay'      => getPaymentTitlePrice($content['payment_id']),
-                       'url'      => generateDerefererUrl($content['url']),
-                       'stamp'    => generateDateTime($content['timestamp_ordered'], '2'),
-                       'recs'     => $content['max_rec'],
-                       'sent'     => generateDateTime($content['timestamp_send'], '2'),
-                       'clix'     => $content['clicks'],
-                       'subject'  => $content['subject'],
-                       'percents' => translateComma($content['clicks'] / $content['max_rec'] * 100)."%",
+                       'sw'                => $SW,
+                       'cat'               => getCategory($content['cat_id']),
+                       'pay'               => getPaymentTitlePrice($content['payment_id']),
+                       'url'               => generateDerefererUrl($content['url']),
+                       'timestamp_ordered' => generateDateTime($content['timestamp_ordered'], 2),
+                       'target_send'       => $content['max_rec'],
+                       'sent'              => generateDateTime($content['timestamp_send'], 2),
+                       'clix'              => $content['clicks'],
+                       'subject'           => $content['subject'],
+                       'percents'          => translateComma($content['clicks'] / $content['max_rec'] * 100)."%",
                );
 
                // Load row template and switch colors