A lot code rewritten:

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

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 920c3cd20db87a0a882ee0ce60d43ee3017b4255..9ef88e563553176ffc2be97e1b7978411ed88b5b 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -74,7 +74,7 @@ LIMIT 1";
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
-       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
        $sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
@@ -98,7 +98,7 @@ if ($listed === true) {
        if (SQL_NUMROWS($result_master) == 1) {
                // Mail order / bonus mail found!
                // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-               list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
+               list($stats_id, $sender, $subject, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
 
                // Transfer data to constants for the template
                if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
@@ -131,13 +131,12 @@ LIMIT %s",
 
                if ($unconfirmed > 0) {
                        // At least one link left to confirm
-                       $OUT = ''; $SW = 2;
+                       $OUT = '';
                        while ($content = SQL_FETCHARRAY($result)) {
                                // User data found? We can take any field of u.
                                if (!is_null($content['status'])) {
                                        // Prepare data for the row template
                                        $content = array(
-                                               'sw'     => $SW,
                                                'userid' => $content['userid'],
                                                'link'   => $LINK,
                                                'id'     => $ID,
@@ -148,15 +147,9 @@ LIMIT %s",
                                        // Load row template and switch colors
                                        $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
                                } else {
-                                       // Insert color-switch
-                                       $content['sw'] = $SW;
-
                                        // No user data found
                                        $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
                                }
-
-                               // Switch color
-                               $SW = 3 - $SW;
                        } // END - while
 
                        // Render it in our new listing
@@ -172,7 +165,7 @@ LIMIT %s",
                // Prepare content
                $content = array(
                        'sender'      => $sender,
-                       'subject'     => $subj,
+                       'subject'     => $subject,
                        'text'        => $text,
                        'url'         => $url,
                        'unconfirmed' => $unconfirmed,