Rewrites/fixes for handling config entries in SQLs

[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 c4768750fd4fcfd3a0581490477dd8513fce8bae..369cf7f3210d3b293ac8e0e86c57e4184a11fe02 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -61,11 +62,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__);
@@ -95,7 +96,7 @@ if (SQL_NUMROWS($result) > 0) {
                        array(bigintval($pool['id'])), __FILE__, __LINE__);
 
                // Load entries
-               $pool = merge_array($pool, SQL_FETCHARRAY($result_mails);
+               $pool = merge_array($pool, SQL_FETCHARRAY($result_mails));
 
                // Merge result
                SQL_FREERESULT($result_mails);
@@ -104,11 +105,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 +125,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);