fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / admin / what-email_archiv.php

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 418cfc8ab6cac7c39e643e6a04bca6c5334ae947..d5ebddd50089297ea0a02484f6aad614e2dd56a3 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -61,11 +61,11 @@ ORDER BY
 $result_maximum = SQL_QUERY($sql, __FILE__, __LINE__);
 
 // Set offset an current page to default values
-if (!isGetRequestElementSet('page'))   setRequestGetElement('page'  , 1);
-if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', getConfig('mails_page'));
+if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
+if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')).", ".getRequestElement('offset');
+$sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -87,40 +87,44 @@ 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
-               $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);