Some more cleanups/improvements:

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index bbdfcd450a1691943cdad58d07c4d68f455b239d..fbed1deafaa4537c5271b83ede7ed4ee01c3ee4e 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -77,13 +77,13 @@ if (isGetRequestParameterSet('userid')) {
 
                                // Prepare mail and send it away
                                $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message);
+                               sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
                                // Display message
                                loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
                        } else {
                                // Init variables
-                               $OUT = ''; $SW = 2;
+                               $OUT = '';
 
                                // List all unconfirmed mails
                                // @TODO Find a way to rewrite this. See some lines above for different queries
@@ -91,7 +91,7 @@ if (isGetRequestParameterSet('userid')) {
                                        // Initializes some variables
                                        $cat = '';
                                        $DATA = '';
-                                       $PROBLEM = '{--GENERAL_MAIL_PROBLEM--}';
+                                       $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
                                        $result_data = false; // Closes Bug #58
 
                                        // Load data from stats table...
@@ -126,11 +126,10 @@ if (isGetRequestParameterSet('userid')) {
 
                                                // Prepare data for the row template
                                                $content = array(
-                                                       'sw'        => $SW,
                                                        'link'      => $LINK,
                                                        'subject'   => $content['subject'],
                                                        'timestamp' => generateDateTime($content['timestamp'], 0),
-                                                       'cat'       => getCategory($content['cat_id']),
+                                                       'cat_id'    => $content['cat_id'],
                                                );
 
                                                // Load row template
@@ -139,15 +138,13 @@ if (isGetRequestParameterSet('userid')) {
                                                // Load template for error
                                                $OUT .= loadTemplate('admin_list_links_problem', true,
                                                        array(
-                                                               'sw'            => $SW,
                                                                'problem'       => $PROBLEM,
                                                                'data'          => $DATA
                                                        )
                                                );
                                        }
 
-                                       // Switch color and free result
-                                       $SW = 3 - $SW;
+                                       // Free result
                                        SQL_FREERESULT($result_data);
                                } // END - while