X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=c4768750fd4fcfd3a0581490477dd8513fce8bae;hp=418cfc8ab6cac7c39e643e6a04bca6c5334ae947;hb=bd439a79803904c8f255b9b89c876825790f1bfa;hpb=e7627208baf6669248953b5b07aa67d0724dea75
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 = "".$unconfirmed."";
+ $pool['unconfirmed'] = '' . $pool['unconfirmed'] . '';
} // 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']),