More rewrites/templates swapped out:

[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 369cf7f3210d3b293ac8e0e86c57e4184a11fe02..d840755cd5622338c1105c38a76e00090e1b3947 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -66,7 +66,7 @@ if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
 if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
+$sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -109,23 +109,11 @@ if (SQL_NUMROWS($result) > 0) {
                } // END - if
 
                // Prepare data for the row template
-               $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'        => $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'],
-               ));
+               $content['sw'] = $SW;
+               $content['timestamp'] = generateDateTime($pool['timestamp'], 0);
+
+               // Merge pool data with content
+               $content = merge_array($content, $pool);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_email_archiv_row', true, $content);