X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=ee06841fda1967d30946f77d8b384d03b107f9fd;hb=b7a1b50bec9d45efcf037db83b7e7c58ba2846dd;hp=3971bb56eda85cfc445f1d86a92d79b1ab27aa86;hpb=199db88bf11bedd3d6c1dac997f942228ccb34d1;p=mailer.git

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 3971bb56ed..ee06841fda 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -42,21 +42,21 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Normal mails ordered by your members
 //              0     1       2       3       4           5          6          7       8        9          10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
- WHERE data_type IN('ADMIN', 'TEMP', 'NEW', 'ACTIVE')
- ORDER BY timestamp DESC";
+FROM "._MYSQL_PREFIX."_pool
+WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
+ORDER BY timestamp DESC";
+
 $WHO = _ALL;
 $SQL2 = "";
 
@@ -85,8 +85,9 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 	// Bonus mails sent by you
 	//               0     1       2        3        4      5       6          7       8      9         10          11        12
 	$SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
-	 FROM "._MYSQL_PREFIX."_bonus
-	 ORDER BY timestamp DESC";
+	FROM "._MYSQL_PREFIX."_bonus
+	WHERE is_notify='N'
+	ORDER BY timestamp DESC";
 
 	// Check for maximum pages
 	$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
@@ -151,8 +152,9 @@ if (SQL_NUMROWS($result_list) > 0) {
 		$content['payment']     = GET_PAYMENT($pool['payment_id']);
 		$content['category']    = GET_CATEGORY($pool['cat_id']);
 		$content['receivers']   = str_replace(";", ", ", $pool['receivers']);
-		$content['type']        = GET_POOL_TYPE($pool['data_type']);
+		$content['type']        = TRANSLATE_POOL_TYPE($pool['data_type']);
 		$content['frametester'] = FRAMETESTER($pool['url']);
+		$content['url']         = COMPILE_CODE($pool['url']);
 		$content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
 
 		// Load row template
@@ -163,6 +165,7 @@ if (SQL_NUMROWS($result_list) > 0) {
 	SQL_FREERESULT($result_list);
 
 	// Add navigation (with change box and colspan=3)
+	$content['nav'] = "";
 	if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
 
 	// Prepare content
@@ -202,7 +205,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 			$content['time']        = CREATE_FANCY_TIME($content['time']);
 			$content['category']    = GET_CATEGORY($content['cat_id']);
 			$content['receivers']   = str_replace(";", ", ", $content['receivers']);
-			$content['type']        = GET_POOL_TYPE($content['data_type']);
+			$content['type']        = TRANSLATE_POOL_TYPE($content['data_type']);
 			$content['frametester'] = FRAMETESTER($content['url']);
 			$content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
 
@@ -211,6 +214,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 		}
 
 		// Add navigation (without change box but with colspan=3)
+		$content['nav'] = "";
 		if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
 
 		// Prepare content