Adding of network type handlers finished (listing is still work-in-progress)

[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 efc103e29f6d633eb8e158e60607f883a89b1637..045ec1f2ae864940cfb9732d64e8a2f5da18d40a 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -61,8 +61,8 @@ 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 (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 1);
+if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
 $sql .= " LIMIT ".(getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset');
@@ -104,11 +104,11 @@ if (SQL_NUMROWS($result) > 0) {
                $pool['unconfirmed'] = $pool['max_rec'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file
-                       $pool['unconfirmed'] = '<strong><a href="{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=' . $pool['id'] . '">' . $pool['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'],
@@ -124,7 +124,7 @@ if (SQL_NUMROWS($result) > 0) {
                        '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);