X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-stats.php;h=b78419c8dfaeacc4791a30a5ee4b331dfe94bfb1;hb=6bfe4e5cd741cb5690a42ef9e67253a0603ee2b6;hp=a6a9468d838d0721da798c0921bfe03805bee606;hpb=19cd0d37b2bcbf9dd4f3c38a9cecd7f5011d6b66;p=mailer.git

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index a6a9468d83..b78419c8df 100644
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -32,20 +32,23 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-} elseif (!IS_LOGGED_IN()) {
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("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=%d AND data_type != 'SEND'
+WHERE sender=%s AND data_type != 'SEND'
 ORDER BY timestamp DESC",
 	array($GLOBALS['userid']), __FILE__, __LINE__);
 
@@ -60,15 +63,15 @@ if (SQL_NUMROWS($result) > 0) {
 		// Prepare content for output
 		$content = array(
 			'sw'    => $SW,
-			'id'    => $data['id']
+			'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'], "0"),
+			'stamp' => MAKE_DATETIME($data['timestamp'], "2"),
 			'recs'  => $data['target_send'],
 			'type'  => TRANSLATE_POOL_TYPE($data['data_type']),
-			'zip'   => bigintval($data['zip'])
+			'zip'   => $data['zip']
 		);
 
 		// Load template
@@ -79,10 +82,10 @@ if (SQL_NUMROWS($result) > 0) {
 	} // END - if
 
 	// Load main template
-	LOAD_TEMPLATE("member_pool", false, $OUT);
+	$main_content['pool'] = LOAD_TEMPLATE("member_pool_table", true, $OUT);
 } else {
 	// No mails in pool!
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_IN_POOL);
+	$main_content['pool'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_POOL);
 }
 
 // Free result
@@ -92,7 +95,7 @@ SQL_FREERESULT($result);
 //                               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=%d
+WHERE userid=%s
 ORDER BY timestamp_ordered DESC",
 	array($GLOBALS['userid']), __FILE__, __LINE__);
 
@@ -107,9 +110,9 @@ if (SQL_NUMROWS($result) > 0) {
 			'pay'   => GET_PAYMENT($data[2]),
 			'subj'  => COMPILE_CODE($data[3]),
 			'url'   => DEREFERER($data[4]),
-			'stamp' => MAKE_DATETIME($data[5], "0"),
+			'stamp' => MAKE_DATETIME($data[5], "2"),
 			'recs'  => $data[6],
-			'sent'  => MAKE_DATETIME($data[7], "0"),
+			'sent'  => MAKE_DATETIME($data[7], "2"),
 			'clix'  => $data[8],
 			'perc'  => COMPILE_CODE($data[8] / $data[6] * 100)."%",
 		);
@@ -119,18 +122,18 @@ if (SQL_NUMROWS($result) > 0) {
 		$SW = 3 - $SW;
 	}
 
-	// Remember rows in template
-	define('__STATS_ROWS', $OUT);
-
 	// Load main template
-	LOAD_TEMPLATE("member_stats_table");
+	$main_content['stats'] = LOAD_TEMPLATE("member_stats_table", true, $OUT);
 } else {
 	// No mail orders fond
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_IN_STATS);
+	$main_content['stats'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_STATS);
 }
 
 // Free result
 SQL_FREERESULT($result);
 
+// Load main template
+LOAD_TEMPLATE("member_stats_pool", false, $main_content);
+
 //
 ?>