Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[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 545bba14333c3ca3742f0a62bea756c6e5995fcf..b4df32c7465d77044acb0f44e1a1d891971d2b32 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 04/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 04/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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,17 +62,17 @@ 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__);
 
 // Calculate pages
-$pages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
+$numPages = round(SQL_NUMROWS($result_maximum) / getConfig('mails_page') + 0.5);
 
 // Free the result which we don't need
 SQL_FREERESULT($result_maximum);
@@ -80,47 +81,31 @@ if (SQL_NUMROWS($result) > 0) {
        // Mail orders are in pool so we can display them
 
        // Add navigation table rows
-       $content['top_email_nav']    = '';
-       $content['bottom_email_nav'] = '';
-       if ($pages > 1) {
-               $content['top_email_nav']    = addEmailNavigation($pages, getConfig('mails_page'), true , 3, true);
-               $content['bottom_email_nav'] = addEmailNavigation($pages, getConfig('mails_page'), false, 3, true);
-       } // END - if
+       $content['top_email_nav']    = addEmailNavigation($numPages, getConfig('mails_page'), true , 3, true);
+       $content['bottom_email_nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
 
+       // 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) {
-                       // 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>";
-               } // END - if
+               $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'],  ($pool['max_rec'] - $pool['clicks']), 'mid');
 
                // Prepare data for the row template
-               $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,
-                       'ruserids'    => convertReceivers($pool['receivers']),
-                       'unconfirmed' => $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);
@@ -134,7 +119,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_email_archiv', false, $content);
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // Free memory