X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-stats.php;h=ef5959e75020cb81ea7d71f36e450abe4f1eaf46;hb=e6d0294f587cab6b74f689ecdf2ebb3cf2b09e25;hp=6f740bf7f212efdee773fdef491cd765d136897d;hpb=e6785b4a4845d7a885b0e9c6dac517c6867940e1;p=mailer.git

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 6f740bf7f2..ef5959e750 100644
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,23 +38,26 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	LOAD_URL('modules.php?module=index');
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
 
 // Init output
 $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",
+$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?
@@ -63,82 +66,86 @@ if (SQL_NUMROWS($result) > 0) {
 	$OUT = ''; $SW = 2;
 	while ($data = SQL_FETCHARRAY($result)) {
 		// Is the ZIP code set? If not, set dashes
-		if (empty($data['zip'])) $data['zip'] =  "---";
+		if (empty($data['zip'])) $data['zip'] =  '---';
 
 		// Prepare content for output
 		$content = array(
-			'sw'    => $SW,
-			'id'    => $data['id'],
-			'cat'   => GET_CATEGORY($data['cat_id']),
-			'pay'   => GET_PAYMENT($data['payment_id']),
-			'subj'  => COMPILE_CODE($data['subject']),
-			'url'   => DEREFERER($data['url']),
-			'stamp' => MAKE_DATETIME($data['timestamp'], "2"),
-			'recs'  => $data['target_send'],
-			'type'  => TRANSLATE_POOL_TYPE($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
-		$OUT .= LOAD_TEMPLATE("member_pool_row", true, $content);
+		$OUT .= loadTemplate('member_pool_row', true, $content);
 
 		// Switch color
 		$SW = 3 - $SW;
 	} // END - if
 
 	// Load main template
-	$main_content['pool'] = LOAD_TEMPLATE("member_pool_table", true, $OUT);
+	$main_content['pool'] = loadTemplate('member_pool_table', true, $OUT);
 } else {
 	// No mails in pool!
-	$main_content['pool'] = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_POOL'));
+	$main_content['pool'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_POOL'));
 }
 
 // Free result
 SQL_FREERESULT($result);
 
 // Load sent orders
-//                               0     1         2         3      4            5            6            7           8
-$result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp_ordered, max_rec, timestamp_send, clicks
-FROM `{!_MYSQL_PREFIX!}_user_stats`
-WHERE userid=%s
-ORDER BY timestamp_ordered DESC",
+$result = SQL_QUERY_ESC("SELECT
+	`id`, `cat_id`, `payment_id`, `subject`, `url`, `timestamp_ordered`, `max_rec`, `timestamp_send`, `clicks`
+FROM
+	`{?_MYSQL_PREFIX?}_user_stats`
+WHERE
+	`userid`=%s
+ORDER BY
+	`timestamp_ordered` DESC",
 	array(getUserId()), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
 	// Mail orders are in pool so we can display them
 	$OUT = ''; $SW = 2;
-	while ($data = SQL_FETCHROW($result)) {
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
+		// @TODO Rewrite in template: clix->clicks
 		$content = array(
-			'sw'    => $SW,
-			'cat'   => GET_CATEGORY($data[1]),
-			'pay'   => GET_PAYMENT($data[2]),
-			'subj'  => COMPILE_CODE($data[3]),
-			'url'   => DEREFERER($data[4]),
-			'stamp' => MAKE_DATETIME($data[5], "2"),
-			'recs'  => $data[6],
-			'sent'  => MAKE_DATETIME($data[7], "2"),
-			'clix'  => $data[8],
-			'perc'  => COMPILE_CODE($data[8] / $data[6] * 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
-		$OUT .= LOAD_TEMPLATE("member_stats_row", true, $content);
+		$OUT .= loadTemplate('member_stats_row', true, $content);
 		$SW = 3 - $SW;
 	}
 
 	// Load main template
-	$main_content['stats'] = LOAD_TEMPLATE("member_stats_table", true, $OUT);
+	$main_content['stats'] = loadTemplate('member_stats_table', true, $OUT);
 } else {
 	// No mail orders fond
-	$main_content['stats'] = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_STATS'));
+	$main_content['stats'] = loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_MAILS_IN_STATS'));
 }
 
 // Free result
 SQL_FREERESULT($result);
 
 // Load main template
-LOAD_TEMPLATE("member_stats_pool", false, $main_content);
+loadTemplate('member_stats_pool', false, $main_content);
 
-//
+// [EOF]
 ?>