More rewrites/templates swapped out:

[mailer.git] / inc / modules / admin / what-list_notifications.php

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index c337999dbb34aa3be46bb58a87e2c6cfea953e45..625df8f4d9540a6c9d8c636bd6cdd98f3987bdb2 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -55,11 +55,15 @@ if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getCon
 
 if (isExtensionActive('bonus')) {
        // Bonus mails sent by you
-       //               0     1       2        3        4      5       6          7       8      9         10          11        12
-       $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
-FROM `{?_MYSQL_PREFIX?}_bonus`
-WHERE is_notify='Y'
-ORDER BY timestamp DESC";
+       $SQL2 = "SELECT
+       `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`,
+       `mails_sent`, `clicks`, (`mails_sent` - `clicks) AS `unconfirmed`
+FROM
+       `{?_MYSQL_PREFIX?}_bonus`
+WHERE
+       `is_notify`='Y'
+ORDER BY
+       `timestamp` DESC";
 
        // Check for maximum pages
        $result_max = SQL_QUERY($SQL2, __FILE__, __LINE__);
@@ -69,7 +73,7 @@ ORDER BY timestamp DESC";
 }
 
 // Create limitation line
-$add = " LIMIT ".(bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))).", ".bigintval(getRequestParameter('offset'));
+$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
 
 // Add limitation
 if (!empty($SQL2)) $SQL2 .= $add;
@@ -85,28 +89,16 @@ if ((isExtensionActive('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($S
 
                // List emails
                $OUT = ''; $content = array();
-               while ($bonus = SQL_FETCHARRAY($result_bonus)) {
-                       // Calculate unconfirmed emails
-                       $bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks'];
-
-                       // Add link?
-                       if ($bonus['unconfirmed'] > 0) {
-                               // Add link to list_unconfirmed what-file
-                               $bonus['unconfirmed'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=" . $bonus['id'] . "%}\">" . $bonus['unconfirmed'] . "</a></strong>";
-                       } // END - if
+               while ($content = SQL_FETCHARRAY($result_bonus)) {
+                       // Add "unconfirmed-link"
+                       $content['unconfirmed_content'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
 
                        // Prepare content
-                       $content = $bonus;
-                       $content['time']        = createFancyTime($content['time']);
-                       $content['category']    = getCategory($content['cat_id']);
-                       $content['receivers']   = convertReceivers($content['receivers']);
-                       $content['type']        = translatePoolType($content['data_type']);
-                       $content['frametester'] = generateFrametesterUrl($content['url']);
                        $content['timestamp']   = generateDateTime($content['timestamp'], 0);
 
                        // Load row template
                        $OUT .= loadTemplate('admin_list_notify_emails_row', true, $content);
-               }
+               } // END - if
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = '';