Fixes for auto-activation of extensions while registration phase

[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 d840755cd5622338c1105c38a76e00090e1b3947..e5f66afc1197cd734ce1e08ef2dce39521eef342 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -48,7 +48,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-// Init SQL string
+// Init SQL
 $sql = "SELECT
        `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
@@ -72,24 +72,20 @@ $sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page')
 $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);
 
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // 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;
+       $OUT = '';
        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",
@@ -102,14 +98,9 @@ if (SQL_NUMROWS($result) > 0) {
                SQL_FREERESULT($result_mails);
 
                // Unconfirmed mails
-               $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>';
-               } // END - if
+               $pool['unconfirmed'] = generateUnconfirmedAdminLink($pool['id'],  ($pool['max_rec'] - $pool['clicks']), 'mid');
 
                // Prepare data for the row template
-               $content['sw'] = $SW;
                $content['timestamp'] = generateDateTime($pool['timestamp'], 0);
 
                // Merge pool data with content
@@ -117,7 +108,6 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_email_archiv_row', true, $content);
-               $SW = 3 - $SW;
        } // END - while
 
        // Remmber generated rows in array
@@ -127,7 +117,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