From: Roland Häder <roland@mxchange.org>
Date: Mon, 16 Nov 2009 04:49:50 +0000 (+0000)
Subject: Double->single rewrites, fixes for email archive
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=bd439a79803904c8f255b9b89c876825790f1bfa;hp=e7627208baf6669248953b5b07aa67d0724dea75

Double->single rewrites, fixes for email archive
---

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index 0e5a9520ea..3702659edb 100644
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -121,7 +121,7 @@ ORDER BY
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Check if confirmation links are purged or not
 				$result_links = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-				array(bigintval($content['id'])), __FILE__, __LINE__);
+					array(bigintval($content['id'])), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result_links) > 0) {
 					// At least one link was found, enougth to pay back the points
 					$points += $content['points'] * SQL_NUMROWS($result_links);
@@ -153,7 +153,7 @@ ORDER BY
 	// Add points from deleted accounts to jackpot, but here just add to notify mail
 	if ($admin_points > 0) {
 		// Send mail to admin
-		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), "admin_autopurge_points", translateComma($points), 0);
+		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_SUBJECT'), 'admin_autopurge_points', translateComma($admin_points), 0);
 	} // END - if
 
 	// Run all SQLs here
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 418cfc8ab6..c4768750fd 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -65,7 +65,7 @@ if (!isGetRequestElementSet('page'))   setRequestGetElement('page'  , 1);
 if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset');
+$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -87,20 +87,24 @@ if (SQL_NUMROWS($result) > 0) {
 		$content['bottom_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), false, 3, true);
 	} // END - if
 
+	// List all entries
 	$OUT = ''; $SW = 2;
-	// @TODO Rewrite to SQL_FETCHARRAY()
-	while ($pool = SQL_FETCHROW($result)) {
+	while ($pool = SQL_FETCHARRAY($result)) {
 		// Check sent mails and clicks
 		$result_mails = 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($sent, $clicks) = SQL_FETCHROW($result_mails);
+
+		// Load entries
+		$pool = merge_array($pool, SQL_FETCHARRAY($result_mails);
+
+		// Merge result
 		SQL_FREERESULT($result_mails);
 
 		// Unconfirmed mails
-		$unconfirmed = $sent - $clicks;
-		if ($unconfirmed > 0) {
+		$pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks'];
+		if ($pool['unconfirmed'] > 0) {
 			// Add link to list_unconfirmed what-file
-			$unconfirmed = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$unconfirmed."</a></strong>";
+			$pool['unconfirmed'] = '<strong><a href="{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '">' . $pool['unconfirmed'] . '</a></strong>';
 		} // END - if
 
 		// Prepare data for the row template
@@ -111,9 +115,9 @@ if (SQL_NUMROWS($result) > 0) {
 			'text'        => $pool['text'],
 			'pay'         => getPaymentTitlePrice($pool['payment_id']),
 			'cat'         => getCategory($pool['cat_id']),
-			'sent'        => $sent,
+			'sent'        => $pool['max_rec'],
 			'ruserids'    => convertReceivers($pool['receivers']),
-			'unconfirmed' => $unconfirmed,
+			'unconfirmed' => $pool['unconfirmed'],
 			'type'        => translatePoolType($pool['data_type']),
 			'target_send' => $pool['target_send'],
 			'frametester' => generateFrametesterUrl($pool['url']),