X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=369cf7f3210d3b293ac8e0e86c57e4184a11fe02;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hp=8456d5e1ef705478e77e808d7887b2c2265e9127;hpb=d49fe31440f5946f23cd2b4044c6e0256640dde4;p=mailer.git
diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 8456d5e1ef..369cf7f321 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -1,7 +1,7 @@
0) {
$content['top_email_nav'] = '';
$content['bottom_email_nav'] = '';
if ($pages > 1) {
- $content['top_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), true , '3', true);
- $content['bottom_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), false, '3', true);
+ $content['top_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), true , 3, true);
+ $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[0])), __FILE__, __LINE__);
- list($sent, $clicks) = SQL_FETCHROW($result_mails);
+ array(bigintval($pool['id'])), __FILE__, __LINE__);
+
+ // 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
- $row = array(
+ $content = merge_array($content, array(
'sw' => $SW,
- 'u_link' => generateUserProfileLink($pool[1]),
- 'subject' => $pool[2],
- 'text' => $pool[3],
- 'pay' => getPaymentTitlePrice($pool[5]),
- 'cat' => getCategory($pool[10]),
- 'sent' => $sent,
- 'ruserids' => str_replace(';', ", ", $pool[4]),
- 'unconfirmed' => $unconfirmed,
- 'type' => translatePoolType($pool[6]),
- 'target_send' => $pool[9],
- 'frametester' => generateFrametesterUrl($pool[8]),
- 'url' => $pool[8],
- 'stamp' => generateDateTime($pool[7], '0'),
- 'mid' => $pool[0],
- );
+ 'u_link' => generateUserProfileLink($pool['sender']),
+ 'subject' => $pool['subject'],
+ 'text' => $pool['text'],
+ 'pay' => getPaymentTitlePrice($pool['payment_id']),
+ 'cat' => getCategory($pool['cat_id']),
+ 'sent' => $pool['max_rec'],
+ 'ruserids' => convertReceivers($pool['receivers']),
+ '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, $row);
+ $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
$SW = 3 - $SW;
} // END - while