Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[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..75a93fa8b0bf549fae7ebb5d734ab2ceef51651d 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/09/2003 *
- * ===============                              Last change: 04/21/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/09/2003 *
+ * ===================                          Last change: 04/21/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-stats.php                                   *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,33 +51,37 @@ 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(getMemberId()), __FILE__, __LINE__);
 
 // Are there mails left in pool?
 if (SQL_NUMROWS($result) > 0) {
        // Load all orders
        $OUT = ''; $SW = 2;
-       while ($data = SQL_FETCHARRAY($result)) {
+       while ($content = SQL_FETCHARRAY($result)) {
                // Is the ZIP code set? If not, set dashes
-               if (empty($data['zip'])) $data['zip'] =  '---';
+               if (empty($content['zip'])) $content['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'          => $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']
                );
 
                // Load template
@@ -90,7 +95,7 @@ if (SQL_NUMROWS($result) > 0) {
        $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
@@ -105,37 +110,36 @@ WHERE
        `userid`=%s
 ORDER BY
        `timestamp_ordered` DESC",
-       array(getUserId()), __FILE__, __LINE__);
+       array(getMemberId()), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Mail orders are in pool so we can display them
        $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
                $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_id'            => $content['cat_id'],
+                       'payment_id'        => $content['payment_id'],
+                       'url'               => $content['url'],
+                       'timestamp_ordered' => generateDateTime($content['timestamp_ordered'], 2),
+                       'max_rec'           => $content['max_rec'],
+                       'timestamp_sent'    => generateDateTime($content['timestamp_send'], 2),
+                       'clicks'            => $content['clicks'],
+                       'subject'           => $content['subject'],
+                       'percents'          => ($content['clicks'] / $content['max_rec'] * 100),
                );
 
                // 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