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 252a22e156282d5469b9288d3b80831f7834d2dd..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')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 
@@ -72,8 +72,8 @@ 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
                                displayMessage('{--ADMIN_LINKS_DELETED--}');
@@ -85,7 +85,6 @@ if (isGetRequestParameterSet('userid')) {
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                                        // Initializes all variables
-                                       $cat = '';
                                        $DATA = '';
                                        $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
                                        $result_data = false;
@@ -161,11 +160,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+                       displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found
-               displayMessage(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