More fixes, random refid accounts displayed in front panel

[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 cd43aebdabe981e5a5973ed7b30bf676cac29c05..c337642ab1d8b4734e2e784864ecdc5413725767 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 
@@ -72,11 +72,11 @@ if (isGetRequestParameterSet('userid')) {
                                        array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
-                               $message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
+                               $message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+                               sendEmail(getUserData('userid'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
                                // Display message
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
+                               displayMessage('{--ADMIN_LINKS_DELETED--}');
                        } else {
                                // Init variables
                                $OUT = '';
@@ -84,11 +84,10 @@ if (isGetRequestParameterSet('userid')) {
                                // List all unconfirmed mails
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
-                                       // Initializes some variables
-                                       $cat = '';
+                                       // Initializes all variables
                                        $DATA = '';
                                        $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
-                                       $result_data = false; // Closes Bug #58
+                                       $result_data = false;
 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter
@@ -161,11 +160,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+                       displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed