X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=b1e95ed100ac08293680b491c436febdd36f3b20;hp=545bba14333c3ca3742f0a62bea756c6e5995fcf;hb=a3921e6e7dac39605faa4f9194ff428c331002dc;hpb=258bb8c82f21617f7f90bff8023602a11b986f7e
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 545bba1433..b1e95ed100 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -1,7 +1,7 @@
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 = "".$unconfirmed."";
+ $pool['unconfirmed'] = '' . $pool['unconfirmed'] . '';
} // END - if
// Prepare data for the row template
- $content = array(
+ $content = merge_array($content, array(
'sw' => $SW,
'u_link' => generateUserProfileLink($pool['sender']),
'subject' => $pool['subject'],
'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']),
'url' => $pool['url'],
'timestamp' => generateDateTime($pool['timestamp'], 0),
'mid' => $pool['id'],
- );
+ ));
// Load row template and switch colors
$OUT .= loadTemplate('admin_email_archiv_row', true, $content);