X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=83150be3e37d825c1db78dc6b40cdc1825eaab14;hb=29157685184b9aa2ddbf42e9d2e49141af95f7e2;hp=8a27a5bfb92d445ed855faab5254dae0b90b32cc;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 8a27a5bfb9..83150be3e3 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.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,65 +56,81 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('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";
-
-$WHO = getMessage('_ALL');
+$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";
+
+$WHO = '';
 $SQL2 = '';
 
-if (isGetRequestElementSet(('mid'))) {
+if (isGetRequestParameterSet('mid')) {
 	// Only a specific mail shall be displayed
-	//              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 `id`='".bigintval(getRequestElement('mid'))."'
-	 LIMIT 1";
-	$WHO = getMessage('MAIL_ID').": ".getRequestElement('mid');
-} elseif (isGetRequestElementSet('userid')) {
+	$sql = sprintf("SELECT
+	`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`id`=%s
+LIMIT 1",
+		bigintval(getRequestParameter('mid'))
+	);
+	$WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
+} elseif (isGetRequestParameterSet('userid')) {
 	// All mails by a specific member shall be displayed
-	//              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 sender='".bigintval(getRequestElement('userid'))."'
-ORDER by timestamp DESC";
-	$WHO = getMessage('USER_ID').": ".getRequestElement('userid');
+	$sql = sprintf("SELECT
+	`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+WHERE
+	`sender`=%s
+ORDER BY
+	`timestamp` DESC",
+		bigintval(getRequestParameter('userid'))
+	);
+	$WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_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`
-WHERE is_notify='N'
-ORDER BY timestamp DESC";
+// Init result_bonus
+$result_bonus = false;
 
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Check for maximum pages
-	$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+	$result_bonus = SQL_QUERY("SELECT
+	`id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`,
+	(`mails_sent` - `clicks`) AS `unconfirmed`
+FROM
+	`{?_MYSQL_PREFIX?}_bonus`
+WHERE
+	`is_notify`='N'
+ORDER BY
+	`timestamp` DESC", __FILE__, __LINE__);
 }
 
 // Check for maximum pages
 $result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page')) setRequestGetElement('page', 1);
+if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
 
-if (!isGetRequestElementSet('offset')) {
+if (!isGetRequestParameterSet('offset')) {
 	if (isConfigEntrySet('mails_page')) {
 		// Set config entry
-		setRequestGetElement('offset', getConfig('mails_page'));
+		setGetRequestParameter('offset', getConfig('mails_page'));
 	} else {
 		// Set default one
-		setRequestGetElement('offset', 10);
+		setGetRequestParameter('offset', 10);
 	}
 } // END - if
 
 // Add limitation to SQL string
-if (!isGetRequestElementSet(('mid'))) {
+if (!isGetRequestParameterSet('mid')) {
 	// Create limitation line
-	$add = " LIMIT ".(bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))).", ".bigintval(getRequestElement('offset'));
+	$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
 
 	// For normal mails
 	$sql .= $add;
@@ -124,49 +141,39 @@ if (!isGetRequestElementSet(('mid'))) {
 
 // Run SQL query for normal mails
 $result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = '0';
+$numPages = '0';
 if (isConfigEntrySet('mails_page')) {
-	$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+	$numPages = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
 } // END - if
 
 // Free result
 SQL_FREERESULT($result_normal);
 
 $MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
 	// Init rows
-	$OUT = ''; $content = array();
+	$OUT = '';
 
 	// Walk through all entries
-	while ($pool = SQL_FETCHARRAY($result_list)) {
+	while ($content = SQL_FETCHARRAY($result_list)) {
 		// Unconfirmed mails and sent mails
-		$result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
-		array(bigintval($pool['id'])), __FILE__, __LINE__);
-		list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
+		$result_uncon = SQL_QUERY_ESC("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+			array(bigintval($content['id'])), __FILE__, __LINE__);
+
+		// Load and merge data
+		$content = merge_array($content, SQL_FETCHARRAY($result_uncon));
+
+		// Free result
 		SQL_FREERESULT($result_uncon);
 
 		// Unconfirmed mails
-		$pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
-		if ($pool['unconfirmed'] > 0) {
-			// Add link to list_unconfirmed what-file
-			$pool['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
-		} elseif ($pool['unconfirmed'] < 0) {
-			// Sometimes rarely displayed minus values will be "fixed" to zero
-			$pool['unconfirmed'] = '0';
-		}
+		$content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'mid');
 
 		// Prepare content
-		$content = $pool;
-		$content['sender_link'] = generateUserProfileLink($pool['sender']);
-		$content['payment']     = getPaymentTitlePrice($pool['payment_id']);
-		$content['category']    = getCategory($pool['cat_id']);
-		$content['receivers']   = convertReceivers($pool['receivers']);
-		$content['type']        = translatePoolType($pool['data_type']);
-		$content['frametester'] = generateFrametesterUrl($pool['url']);
-		$content['timestamp']   = generateDateTime($pool['timestamp'], 0);
+		$content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
 		// Load row template
 		$OUT .= loadTemplate('admin_list_emails_row', true, $content);
@@ -176,8 +183,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'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+	$content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
 	// Prepare content
 	$content['rows'] = $OUT;
@@ -187,37 +193,25 @@ if (SQL_NUMROWS($result_list) > 0) {
 	loadTemplate('admin_list_emails', false, $content);
 
 	$MAIL = true;
-	if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
-		// Check only if bonus extension is active
-		if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
+	if ((isExtensionActive('bonus')) && (empty($WHO))) {
+		// Only check if bonus extension is active
+		if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
 	} // END - if
 }
 
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Load bonus mails only when extension is active
-	if (SQL_NUMROWS($result_bonus) > 0) {
+	if (!SQL_HASZERONUMS($result_bonus)) {
 		// Calculate pages
-		$PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+		$numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
 		// List emails
-		$OUT = ''; $content = array();
-		while ($bonus = SQL_FETCHARRAY($result_bonus)) {
-			// Calculate unconfirmed emails
-			$bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks'];
-
-			// Add link?
-			if ($bonus['unconfirmed'] > 0) {
-				// Add link to list_unconfirmed what-file
-				$bonus['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
-			} // END - if
+		$OUT = '';
+		while ($content = SQL_FETCHARRAY($result_bonus)) {
+			// Add link to list_unconfirmed what-file
+			$content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
 
 			// Prepare content
-			$content = $bonus;
-			$content['time']        = createFancyTime($content['time']);
-			$content['category']    = getCategory($content['cat_id']);
-			$content['receivers']   = convertReceivers($content['receivers']);
-			$content['type']        = translatePoolType($content['data_type']);
-			$content['frametester'] = generateFrametesterUrl($content['url']);
 			$content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
 			// Load row template
@@ -225,8 +219,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 		} // END - while
 
 		// Add navigation (without change box but with colspan=3)
-		$content['nav'] = '';
-		if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+		$content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
 		// Prepare content
 		$content['rows'] = $OUT;
@@ -239,8 +232,8 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
 
 if ($MAIL === false) {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 } // END - if
 
-//
+// [EOF]
 ?>