X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-stats.php;h=8a37457834b40138ecdace2802f72110ab840217;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hp=b72df1819658c270f48d0a751f3618219261103e;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index b72df18196..8a37457834 100644
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/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 *
@@ -55,45 +56,29 @@ $result = SQL_QUERY_ESC("SELECT
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
-	`sender`=%s AND `data_type` != 'SEND'
+	`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) {
+if (!SQL_HASZERONUMS($result)) {
 	// Load all orders
-	$OUT = ''; $SW = 2;
-	while ($data = SQL_FETCHARRAY($result)) {
-		// Is the ZIP code set? If not, set dashes
-		if (empty($data['zip'])) $data['zip'] =  '---';
-
+	$OUT = '';
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare content for output
-		$content = array(
-			'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']
-		);
+		$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
@@ -110,35 +95,32 @@ 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
-		// @TODO Rewrite in template: clix->clicks
 		$content = array(
-			'sw'                => $SW,
-			'cat'               => getCategory($content['cat_id']),
-			'pay'               => getPaymentTitlePrice($content['payment_id']),
-			'url'               => generateDerefererUrl($content['url']),
+			'cat_id'            => $content['cat_id'],
+			'payment_id'        => $content['payment_id'],
+			'url'               => $content['url'],
 			'timestamp_ordered' => generateDateTime($content['timestamp_ordered'], 2),
-			'target_send'       => $content['max_rec'],
-			'sent'              => generateDateTime($content['timestamp_send'], 2),
-			'clix'              => $content['clicks'],
+			'max_rec'           => $content['max_rec'],
+			'timestamp_sent'    => generateDateTime($content['timestamp_send'], 2),
+			'clicks'            => $content['clicks'],
 			'subject'           => $content['subject'],
-			'percents'          => translateComma($content['clicks'] / $content['max_rec'] * 100)."%",
+			'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